With fast-forward merge requests, you can retain a linear Git history and a way to accept merge requests without creating merge commits. An example commit graph generated using this …

Jan 26, 2018 · The issue we had was that we needed to rebase manualy all awaiting merge request when we accepted a merge request. This has been mostly resolved with a new …

Oct 3, 2019 · Yes, but squash-and-merge isn't the same thing at all. It, um, squashes all the commits into one, and then merges that (so a total of two commits). Fast-forward gives you a …

Mar 3, 2025 · But if there’s going to be a merge from dev → acceptance or acceptance → production then it has to be a fast forward merge. How can I have these rules in Gitlab? (I …

Squash and merge combines multiple small commits into a single meaningful commit. This strategy keeps your repository history clean and makes it easier to track or revert changes. …

Mar 1, 2025 · Let's say I want to merge some feature branch into dev -> then this can be a normal merge But if there's going to be a merge from dev -> acceptance or acceptance -> production …

Dec 8, 2021 · 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 …

Jul 26, 2021 · Suppose your development branch has 3 commits: c1, c2 and c3. On merge to master, git will create a new `merge commit`. Other commits (c1, c2 & c3) are merged at the …

Fast-forward merge requests (FREE) Sometimes, a workflow policy might mandate a clean commit history without merge commits. In such cases, the fast-forward merge is the perfect …

Merge Trains could help solve a fundamental contention problem of fast forward merges because the CI pipeline must be run everytime the merge request is rebased, and the merge request …