Should you merge the up to date aspect branch (with D at its suggestion), Not one of the modifications produced in a very or B are going to be in the result, because they were reverted by W. That's what Alan observed.So now you may have the improvements before the merge, If all the things Alright, checkout into preceding branch and reset with backu