From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rasmus <rasmus@gmx.us>
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Tue, 02 Jul 2013 16:07:38 +0200
Message-ID: <87ppv1hx79.fsf@pank.eu>
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>
	<2013-07-02T10-01-21@devnull.Karl-Voit.at>
	<m2wqp9axsy.fsf@polytechnique.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50630)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1Uu1FJ-00056g-V8
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 10:07:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1Uu1FH-0002Zi-Qw
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 10:07:53 -0400
Received: from plane.gmane.org ([80.91.229.3]:42256)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1Uu1FH-0002ZN-L7
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 10:07:51 -0400
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1Uu1FF-0007gd-Il
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 16:07:49 +0200
Received: from business-213-023-238-209.static.arcor-ip.net ([213.23.238.209])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Tue, 02 Jul 2013 16:07:49 +0200
Received: from rasmus by business-213-023-238-209.static.arcor-ip.net with
	local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Tue, 02 Jul 2013 16:07:49 +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:

>> Alan, how about a short how-to on Worg about Unison and Org-mode
>> methods?
>
> Well, what would be there? If there is (and there may be) an external
> tool that knows how to merge org files (it can be a 3-way merge, if it
> makes things simpler), I could try to devise the magical incantation to
> use it.

There's the GSOC project from last year:

     http://orgmode.org/cgit.cgi/org-merge-driver.git

Whether it is complete or abandoned I don't know.  Here's the Worg
page

      http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/index.html

–Rasmus

-- 
If you can mix business and politics wonderful things can happen!