Merge request fast-forward if possible

if I understand the settings correctly I can force fast forward merges for my project but there is not an option to do fast-forward when it is possible. For me it would be eg. single commit merge request which can be fast forwarded.
Am I right? What I want is to create a merge commit if branches have diverged and to do a fast forward if possible.


Hi @jan.pohanka,

In your project, I think you need to check the Fast-forward merge option in Settings → General → Merge requests → Merge method

Hi @snim2,

that is an option. But in such case the fast forward merge is the only possible. I just want to have both choices

  • do a ff if a merged branch is simple successor of a target
  • create a merge commit if branches have diverged

Ah, I see what you mean. In that case I’m not sure it’s possible, unless you do the merge from the command line.

It seems that it is not possible even on github or gitea.
I’m just curious why not. Maybe I understand workflows bad :smiley:

No, I think it’s just not something that many people would need :sunglasses:

There is a feature request for this: Merge request strategy: fastforward merge with option to merge (instead of rebase) when conflict arise (#325868) · Issues · / GitLab · GitLab