Git is InconsistentZooko provides a nice example of the problems with most distributed version control systems merge algorithms. He gives an example of a merge situation that most version control systems, including git, get wrong, but that darcs, Codeville, SCCS, and perhaps BitKeeper get correct. Still there are some people who argue either that method git does is correct, or that there is no right or wrong way to
