Comment by sigil

Thanks for the link. I read the following from that earlier discussion and immediately thought, isn't this what the Darcs version control system was designed to do?

"What you have to do is to just record the conflict and create two parallel universes, one in which the conflict has been resolved using branch A and another one in which the conflict is resolved using branch B. You then keep these two universes alive and apply all the later changes twice. You have to do this until a judge or a legal body declares one of the "branches" the correct one; this may take years and the decision reverted (even partially) many times."