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 18:08:53 +0200 Message-ID: <20130702160853.GG26752@kuru.dyndns-at-home.com> References: <20130702101723.GA26752@kuru.dyndns-at-home.com> <87y59p3qc7.fsf@engster.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uu38U-0006Cg-Vr for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:09:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uu38T-0005tV-Mp for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:08:58 -0400 Received: from mail-ee0-x235.google.com ([2a00:1450:4013:c00::235]:59600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uu38T-0005sj-GW for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:08:57 -0400 Received: by mail-ee0-f53.google.com with SMTP id c41so2845143eek.26 for ; Tue, 02 Jul 2013 09:08:56 -0700 (PDT) Received: from kuru.dyndns-at-home.com ([2001:610:120:3001:f2de:f1ff:fe37:c76c]) by mx.google.com with ESMTPSA id cg12sm37436263eeb.7.2013.07.02.09.08.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Jul 2013 09:08:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <87y59p3qc7.fsf@engster.org> 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 Hi David, On Tue, Jul 02, 2013 at 05:59:36PM +0200, David Engster wrote: > Suvayu Ali writes: > > I have noticed that git *always* conflicts with TODO state changes. It > > seems changes to a headline is not easy to resolve. > > You mean you change state in a file and git fails to merge this on the > other side, although you didn't change the same line there? I've never > seen such a spurious merge conflict with my Org files. Could you give an > example? It might be that simply switching to another diff.algorithm and > maybe also increasing diff.context would get rid of this. Yes, exactly that. I have stopped using multiple machines for a year now, so I do not have an example at the moment. My history is pretty linear these days :). If I can find the time, I will try work up an example, but that is a big if. That said, I think you might be right. Possibly it could be resolved by just changing the algorithm, I don't know why I never tried that though. Cheers, -- Suvayu Open source is the future. It sets us free.