all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Julien Cubizolles <j.cubizolles@free.fr>
To: emacs-orgmode@gnu.org
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Wed, 03 Jul 2013 23:48:00 +0200	[thread overview]
Message-ID: <87li5n9uy7.fsf@free.fr> (raw)
In-Reply-To: m2a9m5csvf.fsf@polytechnique.org

Alan Schmitt <alan.schmitt@polytechnique.org> writes:

> devnull@Karl-Voit.at 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.

  parent reply	other threads:[~2013-07-03 21:51 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-01 12:06 advice needed: how do you guys sync org files between devices? Xebar Saram
2013-07-01 16:10 ` Brian van den Broek
2013-07-01 16:25   ` Tomas Grigera
2013-07-01 18:02     ` Karl Voit
2013-07-02  7:40       ` Alan Schmitt
2013-07-02  8:03         ` Karl Voit
2013-07-02  9:06           ` Rasmus
2013-07-02  9:43             ` Myles English
2013-07-02 13:36           ` Alan Schmitt
2013-07-02 14:07             ` Rasmus
2013-07-02 14:27               ` Alan Schmitt
2013-07-02 16:03                 ` Suvayu Ali
2013-07-04  8:26                   ` Alan Schmitt
2013-07-02 15:50             ` Brett Viren
2013-07-03 21:48         ` Julien Cubizolles [this message]
2013-07-02 10:17     ` Suvayu Ali
2013-07-02 12:30       ` Xebar Saram
2013-07-02 16:59         ` Juan G.
2013-07-02 15:59       ` David Engster
2013-07-02 16:08         ` Suvayu Ali
2013-07-02 16:11           ` David Engster
2013-07-02 16:51             ` Suvayu Ali
2013-07-01 16:31 ` Ramon Diaz-Uriarte
2013-07-02 19:49 ` Simon Thum
2013-07-03  8:17 ` Samuel Loury
2013-07-03 17:33 ` G. Martin Butz
2013-07-03 20:05   ` Nick Dokos
2013-07-04  8:28 ` Ian Barton
2013-07-04  8:57   ` Nicolas Richard
2013-07-08 15:53   ` Christopher Allan Webber
2013-07-08 21:41     ` Xebar Saram
2013-07-09  8:26       ` Rasmus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87li5n9uy7.fsf@free.fr \
    --to=j.cubizolles@free.fr \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.