Needless to say the adjustments made in C and D continue to can conflict with what was finished by any on the x, but that's just a standard merge conflict.declares that you'll by no means want the tree modifications introduced in because of the merge. As a result, later merges will only bring in tree variations introduced by commits that are not an