Somewhat unpopular opinion: I don’t like merge commits. More, I don’t like that GitHub doesn’t have a feature for fast-forward only merges.
2
7
isn't it in the merge settings for the repo?
1
Nope. GitHub has only 3 options: merge commit, squash (ewww) and rebase and merge. The latter I like but having FF-only would be useful too.
1
Aaah I see, yeah it does always imply the rebase. I think Gitlab lets you require FF-merge
1
GitLab is mostly nicer, yeah
1
Replying to @jogbert
I think github actions are a tad better than gitlab-ci pipelines; but it's a close-run thing :D I have some projects on GH and some on GL.

Oct 20, 2021 Β· 1:17 PM UTC