Of course the changes produced in C and D nonetheless can conflict with what was carried out by any of the x, but which is just a normal merge conflict. declares that you're going to never ever want the tree changes introduced in through the merge. As a result, later merges will only herald t