How to compare and merge two OO "conflict" files

Is there a way to compare and (hopefully) merge two “conflict” files in OmniOutliner?


–Joel Nisson

I don’t think that there is one built-in. On occasion, I have documents which seem to have been forked with each getting subsequent edits.

The compare part I handle by exporting both to some form of text file (generally plain text) and then ‘diffing’ those. I use an app called Kaleidoscope but BBEdit has diff features, and there is a ‘diff’ command you can call from the terminal.

As to merging, I generally do it manually, which is unpleasant.

VisualDiffer is also excellent.