From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alan Schmitt <alan.schmitt@polytechnique.org>
Subject: Re: [SYNC] How do you sync your org-mode files between ndevices (n >
 2))
Date: Thu, 05 Sep 2013 15:03:11 +0200
Message-ID: <m261ufju9c.fsf@polytechnique.org>
References: <m0bo491tdv.fsf@kcals.intra.maillard.im>
	<20130904060424.GA679@kuru.dyndns-at-home.com>
	<499DE163-8785-4997-B6F4-1B4475FAD205@gmail.com>
	<20130904074317.GC679@kuru.dyndns-at-home.com>
	<m2li3bk5yt.fsf@polytechnique.org>
	<20130905094234.GH19491@kuru.dyndns-at-home.com>
	<m2hadzk2ql.fsf@polytechnique.org>
	<2013-09-05T12-22-50@devnull.Karl-Voit.at>
	<87bo47try7.fsf@kafka.loc>
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]:42290)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1VHZDT-0006mf-LS
	for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 09:03:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1VHZDM-0003Y5-WB
	for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 09:03:19 -0400
Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:20291)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1VHZDM-0003Xt-Q5
	for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 09:03:12 -0400
In-reply-to: <87bo47try7.fsf@kafka.loc>
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: Jonas =?iso-8859-1?Q?H=F6rsch?= <coroa@online.de>
Cc: emacs-orgmode@gnu.org

coroa@online.de writes:

> On Thu, Sep 05 2013, Karl Voit wrote:
>
>> * Alan Schmitt <alan.schmitt@polytechnique.org> wrote:
>>> I can't promise anything, but I can try to write something. What
>>> external merging tool should I use?
>>
>> I haven't used it yet but I read that Emacs offers some kind of a
>> 3-way-merger ...
>
> and then there is an early git-merge-tool[1] or rather the org-merge-driver
> for git. i've been using it for half a year now for my org files in
> git, although i seldom have conflicts, as we're just a small group.
>
> maybe somebody on the list has more info on its status?

If someone is adventurous enough, the command to use org-merge-driver
with unison would be:

org-merge-driver -- CURRENTARCH CURRENT1 CURRENT2 NEW

(see my other mail for the rest of the details)

Alan