Hacker News Reader

Would love to see more explanation (with diagrams) of their patching model. Right now I'm not convinced it has any intuitive advantage.

View on HN

This might be deeper than you are looking for, but this is the theory it's based on, and even has diagrams. :)

https://arxiv.org/abs/1311.3903

Here is one concrete example compared to git I found digging around: https://tahoe-lafs.org/~zooko/badmerge/simple.html

For anyone following along still, I just tried the bad merge example that vesinisia linked to with both git and mercurial. Git does indeed do the wrong thing as illustrated on that web page. Mercurial gets it right.

UPDATE: both git and mercurial get the concrete version wrong (https://tahoe-lafs.org/~zooko/badmerge/concrete-good-semanti...)

Reply on news.ycombinator.com