Category: git
Posts in this Category (1)
Vagaries of Git Merge
Published on: November 25, 2019
Git’s merge algorithm seems to have inexplicable semantics leading to some interesting cases. I describe a couple of examples below. The bottom line is that: Git merge is inconsistent: Merge result seems to depend not just on what versions were merged, but also how they were merged. Thus two branches...