On Tue, Apr 26, 2016 at 11:20 AM, Gregory Szorc <g...@mozilla.com> wrote:
> May I propose Servo change its landing bot to rebase commits instead of > merging them so that the repo history be linear so all the complexities > around merge commits can go away? > Personally I am in favor of this, though I don't feel strongly about it. (I'm fine either way.) The biggest advantage to me is the auditability (merge commits aren't reviewed, and tools don't do a good job of showing changes introduced in a merge commit). > FWIW, other VCS hosting and landing services (like Gitlab and MozReview) > have a button that rebases instead of merges for landings. > Frustratingly, GitHub recently added a "rebase and squash" option in addition to its "merge" option, but no "rebase without squashing": https://github.com/blog/2141-squash-your-commits (Of course this doesn't affect any Servo repos because we don't use the GitHub UI for merges.) _______________________________________________ dev-servo mailing list dev-servo@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-servo
