From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alan Schmitt <alan.schmitt@polytechnique.org>
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Tue, 02 Jul 2013 09:40:04 +0200
Message-ID: <m2a9m5csvf.fsf@polytechnique.org>
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>
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]:36686)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1UtvC3-0006Pe-Ux
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 03:40:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1UtvC1-0008OP-KU
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 03:40:07 -0400
Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:16052)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1UtvC1-0008KL-CH
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 03:40:05 -0400
In-reply-to: <2013-07-01T19-47-18@devnull.Karl-Voit.at>
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: news1142@Karl-Voit.at
Cc: emacs-orgmode@gnu.org

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.

Alan