Hot answers tagged

1

What you want to do is called a three-way merge. Basically, you take the original before the branch, and the end result of the two branches. You take the differences between both branches and the original, and merge those diffs together. How do you merge the diffs? That's the tricky part, but here are several projects which implement the algorithm for ...



Only top voted, non community-wiki answers of a minimum length are eligible