Joe (@JoeWurz) and I (@MichelTriana) were doing a lot of crazy shit with code and database scripts today and keeping everything in our neat Mercurial repos, when I came across something I've never seen before in the Mercurial electrified DAG.

My theory is that we both change the same code and the same amounts of bytes, then I did a commit in and pushed, then he continued to work on his local repo adding more stuff, when it was time to push, he go pulled first, got a conflict and then resolved it by choosing his local copy, which had a part with the same change as the previous one I pushed... WTF, that's a crazy case scenario. If  my theory is true thought, then little Mercurial is kinda smart in realizing (and reporting it in the graph) that some code went to heaven.

Comment