The Omni Group
These forums are now read-only. Please visit our new forums to participate in discussion. A new account will be required to post in the new forums. For more info on the switch, see this post. Thank you!

Go Back   The Omni Group Forums > OmniOutliner > OmniOutliner 4 for Mac
FAQ Members List Calendar Search Today's Posts Mark Forums Read

 
How do I tell where the "conflict" is? Thread Tools Search this Thread Display Modes
I'm using OmniPresence to sync my OmniOutline documents. Every once in a while I end up with two copies of an outline, and one's title will indicate a conflict with the original. How can I compare the two files to determine where the conflict lies?

And what causes these conflicts?

(Note: I'm cross-posting this to the OP forum as well.)
 
Aside from using a diff tool to compare the xml source, the only way to see what's different is by manually comparing the two copies. If you have the same file open on multiple devices and using them concurrently it is possible to get a conflict due to editor state and not content. This would be such things as collapsing/expanding different sections and either forcing a save or then making an edit which causing a save and sync.
 
Thanks. And is there a rule of thumb as to which file is labeled "conflict" and which one isn't?
 
The first one to upload changes to the server remains the original.
 
 


Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes



All times are GMT -8. The time now is 12:39 PM.


Powered by vBulletin® Version 3.8.7
Copyright ©2000 - 2017, vBulletin Solutions, Inc.