Zim

  1. Bug #505847
  2. Comment #15

Comment 15 for bug 505847

Revision history for this message
Jaap Karssenberg (jaap.karssenberg) wrote : Re: [Bug 505847] Re: couchdb plugin to share the same notebook on multiple computers

On Thu, May 3, 2012 at 10:24 PM, Matthieu Rakotojaona
<email address hidden> wrote:
>> Btw. do you also intent to build in conflict resolution in zim? If so
>> please have a look at the open bounty for that topic and check the
>> wiki page with details.
>
> Conflict resolution is a very interesting problem. I'd love to tackle
> it, but I'm afraid I do not have that much time. But I'll share anything
> I can think about =]

If I understand correctly couchdb already has a mechanism to deal with
conflicting versions. It just flags one version as a conflict but
stores it anyway. What would be needed in zim is an interface to make
the user aware of the existence of a conflicting version and allow the
user to inspect it and decide how to resolve.

See http://www.zim-wiki.org/wiki/doku.php?id=resolving_syncing_conflicts
for notes.

Regards,

Jaap