Fast-forward merge requests
Retain a linear Git history and a way to accept merge requests without creating merge commits.
Overview
When the fast-forward merge (--ff-only
) setting is enabled, no merge
commits will be created and all merges are fast-forwarded, which means that
merging is only allowed if the branch could be fast-forwarded.
When a fast-forward merge is not possible, the user is given the option to rebase.
Use cases
Sometimes, a workflow policy might mandate a clean commit history without merge commits. In such cases, the fast-forward merge is the perfect candidate.
Enabling fast-forward merges
- Navigate to your project’s Settings and search for the ‘Merge method’
- Select the Fast-forward merge option
- Hit Save changes for the changes to take effect
Now, when you visit the merge request page, you will be able to accept it only if a fast-forward merge is possible.
If the target branch is ahead of the source branch, you need to rebase the source branch locally before you will be able to do a fast-forward merge.
Help and feedback
If there's something you don't like about this feature
If you want something that GitLab does not support
If you didn't find what you were looking for
If you want help with something very specific to your use case, and can use some community support
POST ON GITLAB FORUM
If you have problems setting up or using this feature (depending on your GitLab subscription)
REQUEST SUPPORT
To view all GitLab tiers and features or to upgrade
If you want to try all features available in GitLab.com
If you want to try all features available in GitLab self-managed
If you spot an error or a need for improvement and would like to fix it yourself in a merge request
EDIT THIS PAGE
If you would like to suggest an improvement to this doc
If you want to give quick and simple feedback on this doc