The Omni Group Forums

The Omni Group Forums (http://forums.omnigroup.com/index.php)
-   OmniOutliner 4 for Mac (http://forums.omnigroup.com/forumdisplay.php?f=72)
-   -   How do I tell where the "conflict" is? (http://forums.omnigroup.com/showthread.php?t=31514)

rogbar 2014-05-17 02:56 PM

How do I tell where the "conflict" is?
 
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.)

DerekM 2014-05-19 10:38 AM

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.

rogbar 2014-05-19 11:33 AM

Thanks. And is there a rule of thumb as to which file is labeled "conflict" and which one isn't?

DerekM 2014-05-19 11:40 AM

The first one to upload changes to the server remains the original.


All times are GMT -8. The time now is 03:31 PM.

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