From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <carsten.dominik@gmail.com>
Subject: Git merge tool for Org files
Date: Thu, 18 Aug 2011 12:45:22 +0200
Message-ID: <2DC59D99-FACF-40A2-9914-182C6224BD76@gmail.com>
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:57982)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1Qu06J-0004BN-NN
	for emacs-orgmode@gnu.org; Thu, 18 Aug 2011 06:45:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1Qu06I-0000iA-MJ
	for emacs-orgmode@gnu.org; Thu, 18 Aug 2011 06:45:27 -0400
Received: from mail-ey0-f171.google.com ([209.85.215.171]:44406)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1Qu06I-0000i6-Bg
	for emacs-orgmode@gnu.org; Thu, 18 Aug 2011 06:45:26 -0400
Received: by eyg24 with SMTP id 24so1710826eyg.30
	for <emacs-orgmode@gnu.org>; Thu, 18 Aug 2011 03:45:25 -0700 (PDT)
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: </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: Org Mode List <emacs-orgmode@gnu.org>
Cc: Brian Gough <bjg@network-theory.co.uk>

Hi,

I was wondering if anyone here has the skills and interest to write
a git merge driver for Org mode files, in the way

   =
http://git.savannah.gnu.org/gitweb/?p=3Dgnulib.git;a=3Dblob;f=3Dlib/git-me=
rge-changelog.c

does this for GNU style ChangeLog files?

One of the obstacle for using Org-mode for collaborative programs is =
that
many operations add or remove text from the beginning or end of a file,
or which add or remove a subnode from an outline tree.
These are operations that confuse the git merger, in particular
if two people have added something to a file, or removed/added
sequential sibling nodes.

I believe that this could be solved with a dedicated merge driver
that understands the integrity of an outline (sub)tree, and that
knows that the sequence of two new subtrees added by different people
does not matter.

The idea for this is actually (I believe) from Brian Gough who asked me
about it at FOSDEM.  I have now also run into this problem and would
really find it great if such a merge driver could be written.
Unfortunately, I do not have the skill for this.

- Carsten