Hi, On Fri, Aug 05, 2016 at 11:03:27AM +0530, Manish Goregaokar wrote:
> At the time, Firefox's model wouldn't fit well because semantic > conflicts during merge are an issue -- not actual git merge conflicts, > but two changes which are compatible with their respective parents > but not with each other. That's the only kind of merge conflicts that matters here. Git conflicts simply get a "needs rebase", and never get to the pre-commit testing phase... Note that sometimes changes do not really conflict semantically, and git merge seems to succeed, but the result is still wrong -- automatic merging is inherently fragile. For CI purposes, these fall into the same category as real semantic conflicts though, so they don't need to be handled explicitly -- just keep them in mind when considering the relevance of semantic conflicts... -antrik- _______________________________________________ dev-servo mailing list dev-servo@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-servo
