> > > > Merge commits aren’t that useful > > > I keep coming back to this. Arguably the only benefit they offer now is > procedurally forcing us to not miss a bugfix on a branch, but given how > much we amend many things presently anyway that dilutes that benefit. >
Doesn't this come down to how you read git history, and for example appreciating a change-centric view over branch isolated development? I like a change originating from just one commit, and having tracking visible across the branches. This gives you immediate information about where and how the change was applied without having to go to the jira ticket (and relying on it being accurate). Connecting commits on different branches that are developed separately (no merge tracking) is more complicated. So yeah, I see value in those merge commits. I'm not against trying something new, just would appreciate a bit more exposure to it before making a project wide change. Hence, let's not rush it and just start first with trunk.
