From mboxrd@z Thu Jan  1 00:00:00 1970
From: Brett Viren <bv@bnl.gov>
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Tue, 02 Jul 2013 11:50:42 -0400
Message-ID: <ir4mwq5ezal.fsf@lycastus.phy.bnl.gov>
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: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35971)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bviren@lycastus.phy.bnl.gov>) id 1Uu2rG-0007Pg-5s
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 11:51:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bviren@lycastus.phy.bnl.gov>) id 1Uu2rC-00081F-0B
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 11:51:10 -0400
Received: from smtpgw.bnl.gov ([2620:10a:0:3::30]:45302
	helo=iron4.sec.bnl.local) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bviren@lycastus.phy.bnl.gov>) id 1Uu2rB-0007Wm-R1
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 11:51:05 -0400
In-Reply-To: <m2wqp9axsy.fsf@polytechnique.org> (Alan Schmitt's message of
	"Tue, 02 Jul 2013 15:36:29 +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: Alan Schmitt <alan.schmitt@polytechnique.org>
Cc: news1142@Karl-Voit.at, emacs-orgmode@gnu.org

--=-=-=
Content-Type: text/plain

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

> 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.

It is not org-specific, but meld [1] is a Free and capable GUI merge
tool.  It can be used directly or can be invoked by git to resolve merge
conflicts.


-Brett.

http://meldmerge.org/

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEARECAAYFAlHS9tIACgkQEixH2Z0dKCyeVgCcCcv2CFGlB4+ASuJ5YJswAxqg
bJIAoJ6hKuX69Knpp6Vuog2BWu4NpfAR
=NqtS
-----END PGP SIGNATURE-----
--=-=-=--