From mboxrd@z Thu Jan 1 00:00:00 1970 From: Suvayu Ali Subject: Re: advice needed: how do you guys sync org files between devices? Date: Tue, 2 Jul 2013 12:17:23 +0200 Message-ID: <20130702101723.GA26752@kuru.dyndns-at-home.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtxeU-0005Rr-2s for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 06:17:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtxeL-0006xG-7d for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 06:17:37 -0400 Received: from mail-ea0-x236.google.com ([2a00:1450:4013:c01::236]:35994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtxeK-0006wk-Vy for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 06:17:29 -0400 Received: by mail-ea0-f182.google.com with SMTP id d10so2656168eaj.13 for ; Tue, 02 Jul 2013 03:17:27 -0700 (PDT) Received: from kuru.dyndns-at-home.com ([2001:610:120:3001:f2de:f1ff:fe37:c76c]) by mx.google.com with ESMTPSA id cg12sm35547885eeb.7.2013.07.02.03.17.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Jul 2013 03:17:26 -0700 (PDT) Content-Disposition: inline In-Reply-To: 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 Hello, On Mon, Jul 01, 2013 at 01:25:26PM -0300, Tomas Grigera wrote: > On Mon, Jul 1, 2013 at 1:10 PM, Brian van den Broek < > brian.van.den.broek@gmail.com> wrote: > > > > bzr and hg are (superficially?) easier and git is pretty dominant. [...chomp...chomp...chomp...] > But I agree with Brian that in the long run, though harder to learn, git is > a charm. A comment about using git: I have noticed that git *always* conflicts with TODO state changes. It seems changes to a headline is not easy to resolve. This is where the Org merge tool would be perfect. There was a GSoC project[1], but I have not tested the end result. As far as I recall, although functional, it was not complete. Please do not take this as a vote against using git, I use it myself and I'm a big git enthusiast (as many on the list know by now :-p). Cheers, Footnotes: [1] -- Suvayu Open source is the future. It sets us free.