+1 Vladimir, thank you for all your work on migrating to git.
I generally prefer "squash and merge". Especially when there is a lot of "noise" in the PR commit history: e.g. "fixed CI", "opps, really fixed CI" etc. Also if the PR is small, a single commit is easier to understand (and even remove if required). I don't mind "rebase and merge" if the history is valuable e.g. it's a large PR with a few different almost standalone changes. Thanks On Mon, 17 Jun 2019, 18:58 Vladimir Sitnikov, <[email protected]> wrote: > 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 [ ] I don't care, but it is fine > -1 [ ] Please keep "merge commit" button in GitHub UI because... > > My vote is > +1 Let's disable "merge commit" button in GitHub UI > > Vladimir >
