On Wed, Jul 28, 2010 at 12:40 AM, Pedro <pedro...@gmail.com> wrote: > A conflict resolution GUI sounds too tricky IMHO. I can't see how that could > get much more intuitive than current time diff viewers such as meld or > winmerge.
Pretty simple, we always have a "trunk" version that is shown as the current page. If there is any conflicting version we alert the user and allow to view it in a second window. This view will be read-only and preferably with textual changes highlighted (like meld, but more simplistic). Then we leave it up to the user to copy any changes he want back in the current version. Also the conflicting version will have a "discard" button which just deletes the conflicting version. Note that conflicts should only occur when editing the same parts of notes. Changes in other parts of the same note can easily be merged by bazaar. So assumption is that conflicts should not occur to frequent when using bazaar. When using dropbox or ubuntu one without bazaar they may occur a bit more often, but depends on your usage pattern. Regards, Jaap _______________________________________________ Mailing list: https://launchpad.net/~zim-wiki Post to : firstname.lastname@example.org Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp