[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] advice needed: how do you guys sync org files between devices?
From: |
Julien Cubizolles |
Subject: |
Re: [O] advice needed: how do you guys sync org files between devices? |
Date: |
Wed, 03 Jul 2013 23:48:00 +0200 |
User-agent: |
Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) |
Alan Schmitt <address@hidden> writes:
> address@hidden writes:
>
>> Unison does not offer any merge functionality. However, you can
>> easily use third party tools to handle merge conflicts (Emacs, vim,
>> ...).
>
> (Disclaimer, I participate in Unison's development). Just to clarify
> what I think Karl is saying: one can plug in external tools to handle
> merge into unison, these tools can be specialized depending on the file
> name (for instance the file extension) or the file path. Getting the
> correct configuration line may be tricky, but I, or people on the
> unison-users mailing list, are ready to help.
For me, this line in unison configuration file
merge = Name {,.}* -> emacs --eval '(ediff-merge-files "CURRENT1" "CURRENT2"
nil "NEW")'
opens a new emacs frame with ediff for merging. You should change the
"Name {,.}$" part though (I should too...) to only use this on the files
you want to.
- Re: [O] advice needed: how do you guys sync org files between devices?, (continued)
- Re: [O] advice needed: how do you guys sync org files between devices?, Alan Schmitt, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, Rasmus, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, Alan Schmitt, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, Suvayu Ali, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, Alan Schmitt, 2013/07/04
- Re: [O] advice needed: how do you guys sync org files between devices?, Brett Viren, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?,
Julien Cubizolles <=
- Re: [O] advice needed: how do you guys sync org files between devices?, Suvayu Ali, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, Xebar Saram, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files bet ween devices?, Juan G ., 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, David Engster, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, Suvayu Ali, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, David Engster, 2013/07/02
- Re: [O] advice needed: how do you guys sync org files between devices?, Suvayu Ali, 2013/07/02
Re: [O] advice needed: how do you guys sync org files between devices?, Ramon Diaz-Uriarte, 2013/07/01
Re: [O] advice needed: how do you guys sync org files between devices?, Simon Thum, 2013/07/02
Re: [O] advice needed: how do you guys sync org files between devices?, Samuel Loury, 2013/07/03