Keep only Squash and merge button #363
Conversation
In #362 we found intermediate merge commit can cause the commit history hard to read. Thus, I propose to leave only the "Squash and merge" button to make it clear that we always squash the whole PR into one commit on merging.
|
@sebbASF here is the patch.
Yes. I mean:
This is not always applied but depends on the committers' actions. 
They can choose any of these three and the default is on personal bias (namely, merge commit the preset, and then default to your last action on a specific repo). |
|
Since @bproffitt actively maintains this repo, I'll wait a bit for his opinion on this. |
|
I think that "rebase and merge" should be used to avoid the merge commits |
Literal "Rebase and merge" can still bring the author's merge commit into the main branch, while it does not create a new merge commit on merge. But I agree that sometimes one PR contains multiple portions of changes and is suitable for rebase and commit, while it can be theoretically separated into multiple PRs. |
Exactly. However, we don't chase for statistics here, do we? :D |
I don't think so. |
In #362 we found intermediate merge commit can cause the commit history hard to read. Thus, I propose to leave only the "Squash and merge" button to make it clear that we always squash the whole PR into one commit on merging.