From: Carsten Dominik <carsten.dominik@gmail.com>
To: Org Mode List <emacs-orgmode@gnu.org>
Cc: Brian Gough <bjg@network-theory.co.uk>
Subject: Git merge tool for Org files
Date: Thu, 18 Aug 2011 12:45:22 +0200 [thread overview]
Message-ID: <2DC59D99-FACF-40A2-9914-182C6224BD76@gmail.com> (raw)
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=gnulib.git;a=blob;f=lib/git-merge-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
next reply other threads:[~2011-08-18 10:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-18 10:45 Carsten Dominik [this message]
2011-08-20 14:17 ` Git merge tool for Org files Andrea Crotti
2011-08-20 14:42 ` Carsten Dominik
2011-08-20 14:56 ` Andrea Crotti
2011-08-20 16:04 ` Nick Dokos
2011-08-20 17:30 ` suvayu ali
2011-08-20 19:08 ` Achim Gratz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2DC59D99-FACF-40A2-9914-182C6224BD76@gmail.com \
--to=carsten.dominik@gmail.com \
--cc=bjg@network-theory.co.uk \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).