05-19-2016, 08:05 PM
I don't have much against the merge commits. My main proble was the fact that we had to continuously ask people to rebase whenever the master branch changes. This adds unnecessary delays and can be rather annoying for some. With the new feature, I can squash and rebase without asking the PR submitter to do so.
As @xoft says, It's a pity we cannot selectively squash. I guess we should keep both merge methods? We'd use the squash method almost all of the time, and the old method when preserving the individual commits is desired.
As @xoft says, It's a pity we cannot selectively squash. I guess we should keep both merge methods? We'd use the squash method almost all of the time, and the old method when preserving the individual commits is desired.