From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Engster Subject: Re: advice needed: how do you guys sync org files between devices? Date: Tue, 02 Jul 2013 17:59:36 +0200 Message-ID: <87y59p3qc7.fsf@engster.org> References: <20130702101723.GA26752@kuru.dyndns-at-home.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uu2ze-0001Ki-28 for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 11:59:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uu2zZ-0002UZ-He for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 11:59:50 -0400 Received: from randomsample.de ([83.169.19.17]:52456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uu2zZ-0002TU-4t for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 11:59:45 -0400 In-Reply-To: <20130702101723.GA26752@kuru.dyndns-at-home.com> (Suvayu Ali's message of "Tue, 2 Jul 2013 12:17:23 +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: Suvayu Ali Cc: emacs-orgmode@gnu.org 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. -David