search

holman / ama

Ask @holman anything!
732 stars 278 forks source link

GitHub Flow - Why always --no-ff? #766

Closed dnwe closed 8 years ago

dnwe commented 8 years ago

For small/medium rebased PRs, it seems like a clean linear ff would be preferable to a merge commit, but GH Flow (and the UI-based merge buttons) force a merge commit even when uneccessary...why? Apart from making a bulk git revert easier (which should never really be necessary) I can't really see any advantages.

holman commented 8 years ago

For a service like GitHub, it's going to opt for what is the safest, most sane way to handle something like merges in the interface. For that reason, merge commits are helpful. Not only do they help with reverts, there's some other aspects that are important to consider, too.

In general, though, I don't care at all about Git histories, because that's not the unit of work I operate on.