Mercurial, conflict, merging, further conflicts later on, does Mercurial remember initial resolution?
Imagine this scenario: Alice and Bob both clones a central master Mercurial repository, containing 1 text file Both Alice and Bob makes a change to the same line in the file, and commits Bob pushes back to the central repository, but not Alice Alice now pulls into her repository, notices she now has two heads, and merges Since the merg...