New 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 ...


0

My thoughts: You should implemented objects writeTo/readFrom in some human readable text format like csv, xml, json. Advantages Can be maintained via texteditor Support for textual find&replace If you have (embedded) lists of (sub-) objects make shure that they are always in the same order (i.e. sorted by name). Advantages Windiff will only show ...



Top 50 recent answers are included