icon
Published on

Git merge

Authors

Content

Git merge

https://tycon.github.io/git-inconsistencies.html

  • https://tycon.github.io/git-inconsistencies.html
  • TYCON
  • 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...