Obviously the alterations manufactured in C and D continue to can conflict with what was done by any from the x, but that may be just a standard merge conflict.declares that you will never ever want the tree changes brought in through the merge. Subsequently, later merges will only usher in tree modifications introduced by commits that aren't ances