I recently noticed that I have two versions of the same wiki which have diverged. I don’t know for sure how much they’ve diverged – the sync service I used to keep them in sync wasn’t working, and I added and changed content in both copies separately.
Is there a straightforward way to merge them? Grab all the tiddlers from one of them, put them in the other, ignore duplicates, and display conflicts? Or some procedure by which I can accomplish that?
Thanks