[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] Git merge tool for Org files

From: Andrea Crotti
Subject: Re: [O] Git merge tool for Org files
Date: Sat, 20 Aug 2011 16:17:51 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20110816 Thunderbird/6.0

On 08/18/2011 12:45 PM, Carsten Dominik wrote:

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


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
Does the merge driver need to be written in C?
It looks quite a complex task considering that org-mode files
are not so easy to parse...

Anyway a partly unrelated thing, with git attributes I'm able
to see the diff of crypted org files very easily (maybe someone
is interested), adding to .git/config:

[diff "gpg"]
      textconv = gpg2 --decrypt

and to .gitattributes:
*.gpg diff=gpg

reply via email to

[Prev in Thread] Current Thread [Next in Thread]