zim-wiki team mailing list archive
Mailing list archive
Re: Using Zim within Dropbox or Ubuntu One
"Ralph J.Mayer" <rmayer@xxxxxxxxxxx>
Tue, 27 Jul 2010 10:55:51 +0200
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:188.8.131.52) Gecko/20100713 Thunderbird/3.0.6
> Another nice idea would be a plugin detecting file conflits of
> Dropbox/Ubuntu One and allowing to deal with them. (Both just create a
> supplementary file with a special name with the conflicted version)
I use Dropbox by adding GIT as glue between the local directory and
the directory managed by Dropbox.
Why invent conflict resolution a second time, its already there.
I guess Bazaar with its integration to Zim is also able to handle this.
Viele Grüße / Kind Regards / Cordiali Saluti / Met vriendelijke groet
xmpp:rmayer@xxxxxxxxxxx www.vinoblog.de mailto:rmayer@xxxxxxxxxxx