squash doesn't create a merge commit

@eht16 Generally speaking (and IMO): I generally try to avoid to merge commits because they make the history hard to follow and complicate bisecting. So I'm trying to restrict true merges to specific scenarios.

If the PR consists of multiple commits that are individually valuable, then a normal merge is warranted. On the other hand, if a PR has one main and some fixups on-top (or only a single commit to begin with), then I consider squash merge to avoid merge commits.

I.e. a merge when I truly want to combine two histories (Geany master + the PR) and squash commit when I just applying relatively simple/small patches.


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <geany/geany/pull/3265/c1246005895@github.com>