On 10 May 2016 at 00:23, Rich Freeman <ri...@gentoo.org> wrote: > which introduces some of the uncleanliness of non-rebased > merge commits. In general I'm a fan of rebasing merge commits.
Non-rebased merge commits are worst when the merge involves a collision resolution. While you can in theory rebase merge commits with rebase --preserve, my experience has shown me that its very difficult to get right, and the presence of merge collisions in the "preserved" rebase risks getting the conflict resolution lost mid-rebase, which is not entirely helpful. If there was something we could feasibly put hard software policy constraints against without any subjective "but but but" cases, it would be these cases of "merge included conflicts". -- Kent KENTNL - https://metacpan.org/author/KENTNL