From mboxrd@z Thu Jan 1 00:00:00 1970 From: coroa@online.de (Jonas =?utf-8?Q?H=C3=B6rsch?=) Subject: Re: [SYNC] How do you sync your org-mode files between n devices (n > 2) Date: Thu, 05 Sep 2013 13:42:56 +0200 Message-ID: <87bo47try7.fsf@kafka.loc> References: <20130904060424.GA679@kuru.dyndns-at-home.com> <499DE163-8785-4997-B6F4-1B4475FAD205@gmail.com> <20130904074317.GC679@kuru.dyndns-at-home.com> <20130905094234.GH19491@kuru.dyndns-at-home.com> <2013-09-05T12-22-50@devnull.Karl-Voit.at> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHXxy-0003ix-Rv for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 07:43:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHXxt-0003Pl-8a for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 07:43:14 -0400 Received: from plane.gmane.org ([80.91.229.3]:35301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHXxt-0003Pf-2g for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 07:43:09 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VHXxs-0005Vj-25 for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 13:43:08 +0200 Received: from dslb-178-008-072-238.pools.arcor-ip.net ([178.8.72.238]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 05 Sep 2013 13:43:08 +0200 Received: from coroa by dslb-178-008-072-238.pools.arcor-ip.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 05 Sep 2013 13:43:08 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --=-=-= Content-Type: text/plain On Thu, Sep 05 2013, Karl Voit wrote: > * Alan Schmitt 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? cheers, jonas Footnotes: [1] http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/index.html --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (GNU/Linux) iQIcBAEBAgAGBQJSKG5BAAoJECrXDlJwTJyRYtkQAIbZn1jp6EyUPbk+WCikDYgF IVSWE/Pn9QJ0pBQVRmZP1pcDdAzXyJXVGlqezojgQds4kBZ0WDkNHLbmKV6zjLSX YOQRaQkInNgQU4fwD+kiOk5TW4D/QR4TJYEImQzyS5gpVAhXx4Q9AgH+ubMP6f4E QjE9FBTImvwIDNm6FskvrBHFh5qmQBHGVB58k1RAHivvO6857/Cr4uRgooGZt8WD EB038E4AmTAPN6Hp5mC+Jdyvdmt20UxnSl5chzpnLttiqobmXQoUwxITVX6kQhTx pbQEqWTG1vBvMvDglhCZcQaQAXtOJSpz3txrfuGjWcmwfADgHZrMOtf8AohMs9wi frFBKx1IFLlNS88G7jaNWGT0arzfx4//WOEtop3qiF0RB67yYDfW61mPJA6w/ny6 Mv8h58O2ClB4Vf6V6Ef6C3gg9eoMgcSrlUHzB/fl4cvUANIIipf5kO4hV6Wv6ImO g+k0Do3btBEb05+WbURwJ4XoddROoW5jveqz7JzZZpDpurh/K9x4epQVNunGxunr 5juQL5Nq9Ze0Gy/eKiKdzsTKNpX9HFLEX11pi77BFkOf/XAL3xcoWlI37rsOlT0b lD8mYErRPBoQK0Ff7x0rvl2U1oaxHI/Rz1/iYVEKLogJJ0AbgK9CMmtIkTGVhH1K etNDcBcFo5qkiqT27RDm =kh6R -----END PGP SIGNATURE----- --=-=-=--