From mboxrd@z Thu Jan  1 00:00:00 1970
From: Julien Cubizolles <j.cubizolles@free.fr>
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Wed, 03 Jul 2013 23:48:00 +0200
Message-ID: <87li5n9uy7.fsf@free.fr>
References: <CAOQHXPrecrtEQM4j5SNXrRCHe7dKhLsc6W0PmsRUwPmOaD7GPw@mail.gmail.com>
	<CAF6Daj+c=a8E2xjk73i=mYMxMiomkFWaPNMWCi3cmAXHOmj5bg@mail.gmail.com>
	<CAJMNdQ+K=HEfj0L7H2kOYD00Q8X=2w9mMMK_51Tti-0+MMWAvQ@mail.gmail.com>
	<2013-07-01T19-47-18@devnull.Karl-Voit.at>
	<m2a9m5csvf.fsf@polytechnique.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56451)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UuUxB-0000Ts-8S
	for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 17:51:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UuUx9-00057s-Bi
	for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 17:51:09 -0400
Received: from plane.gmane.org ([80.91.229.3]:59301)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UuUx9-00057h-6N
	for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 17:51:07 -0400
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UuUx7-0001Pq-Ke
	for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 23:51:05 +0200
Received: from gas45-3-82-244-252-119.fbx.proxad.net ([82.244.252.119])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Wed, 03 Jul 2013 23:51:05 +0200
Received: from j.cubizolles by gas45-3-82-244-252-119.fbx.proxad.net with
	local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Wed, 03 Jul 2013 23:51:05 +0200
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.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.