Hi, On Tue, Apr 26, 2016 at 11:20:17AM -0700, Gregory Szorc wrote:
> The thing is, I'm not a huge fan of merge commits in version control, > especially for large projects. [...] > All I'm asking is that Servo and its immediately related projects > consider changing their ways. Please don't. This is not best practice for Git usage. A few years back, a certain Linus Torvalds (inventor of Git, and probably its heaviest user) explicitly requested maintainers to stop rebasing branches that contributors have submitted for upsteam inclusion. I don't remember all the arguments; but the point that stuck with me was that such rebases are generally untested, and they have no history. Automatic patch merging works out surprisingly often -- but sometimes it doesn't. If there is a bad merge commit, `git bisect` will clearly point to it as the culprit; while problems introduced in a rebase will in no way indicate the rebase as the cause. -antrik- _______________________________________________ dev-servo mailing list [email protected] https://lists.mozilla.org/listinfo/dev-servo
