Am 16.06.19 um 20:10 schrieb Vladimir Sitnikov: > Philippe>Fixed and tested first PR merging > > Ok. Great. > > Should we use "squash and merge" / "rebase and merge" for PRs by default? > > You just created a merge commit "Merge pull request #468 from > ubikloadpack/master", and merge commits might become complicated, > especially when you merge commits that were created long ago. > I don't think we want this for JMeter history: > https://twitter.com/dominikhonnef/status/1126850717690552320 > > I suggest we try to stick with linear history. > What if we disable "merge" button and leave just "squash and merge" / > "rebase and merge"?
As it is only a few people that can do a merge, I would try to first teach those to use the alternatives before taking one away. I tend to favor rebase and merge, as it keeps the smaller steps that lead to the PR while giving a nice linear history after the merge. Felix > > Vladimir >
