When you merge the up to date facet department (with D at its tip), none of the improvements made within a or B are going to be in the result, because they have been reverted by W. That may be what Alan saw.Take the of your commit you need, go on your git root folder and use git checkout -b - that may develop a new branch starting from that very la