4 ms·

Gitlab supports an option called "Fast-forward merge": > No merge commits are created. > Fast-forward merges only. > When there is a merge conflict, the user

by nsajko 4y ago

Gitlab supports an option called "Fast-forward merge": > No merge commits are created. > Fast-forward merges only. > When there is a merge conflict, the user is given the option to rebase. The maintainer can enable this for a project.

spyremeown 4y ago
So does almost every PR-based workflow tool for (bitbucket, GitHub etc). It's very common.