Am 17.06.19 um 19:58 schrieb Vladimir Sitnikov: > Hi, > > We have migrated to GitBox, and now committers have enough grants to merge > PRs right from GitHub UI. > With great power comes great responsibility. > > Unfortunately, the button defaults to "create merge commit". > It makes Git history non-linear which might be painful to analyze. > Non-linear histories might be helpful, however I think we don't really need > those from GitHub UI. > > Other options are > "squash and merge" (==pretend the PR was developed as a single commit on > top of the current master) > "rebase and merge" (==pretend all the commits in PR were developed on top > of the current master) > > Both options more or less resemble the way we used to work with SVN. > "Create merge commit from GitHub UI" is something new, and I suggest to > disable it. > Note: merge commits could still be created though command line, and it is a > completely different topic. > > I suggest to make a formal vote about it: > > +1 [ ] Let's disable "merge commit" button in GitHub UI > +0 [x] I don't care, but it is fine
I think the best option would be to reorder the buttons and set one of the other options as the default. But I fear this is not possible. As disabling the button is not permanent and the functionality is still available through the command line, I think it is not necessary to have a real vote on this, if a prior discussion has shown enough consensus. Felix (sorry for the late answer) > -1 [ ] Please keep "merge commit" button in GitHub UI because... > > My vote is > +1 Let's disable "merge commit" button in GitHub UI > > Vladimir >
