Not surprisingly the alterations made in C and D continue to can conflict with what was carried out by any with the x, but which is just a normal merge conflict." This is not normally a bug—in fact, some genuinely hairy reduced-amount algorithms try this on reason—however it should generally be averted. @Steve Gury give's a good illustration of