James O'GormanMFW my carefully crafted commit message gets squash-merged into a one-line commit
Daniel Silverstone@jamesog squash merge is the bane of git forges and should be banned
@kinnison Indeed. I am very anti-squash and disable it on all the repos it's in my power to do so.
I also wish GitHub would get around to adding ff-only merges. Merge commits are my other big pet peeve.
@jamesog I thought that they offered rebase/ff but not my favourite (semi linear)
@kinnison Yes, rebase is an option, but not straight merge --ff-only. I’ve seen rebase merges go wrong and break main, where a ff merge wouldn’t have done
@jamesog If a rebase-merge broke then an ff-merge would have been rejected, no?
@kinnison Correct, which is what I'd want. Most of the time rebase is fine, but once in a while GitHub says "branch has no conflicts, you can rebase" and then introduces some subtle error. FF prevents all of that by ensuring your branch must be up to date.
@jamesog aah I see yes that's no good. I really like the combo of ff and merge commit that gitlab's semi linear history approach gives. You can see a single line of commits, but they are grouped into logical sections by the merge commits.
@jamesog and to reference your rebase grump, if you have to rebase to do a semi linear merge then gitlab reruns the Ci before the merge
Oleg