Should you merge the up-to-date side branch (with D at its suggestion), Not one of the modifications made within a or B are going to be in the result, as they have been reverted by W. That is what Alan noticed. Then, depending on the end result, your method can just hold working from there or you