Carsten Dominik writes:
> 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.
On of the things that I think would be necessary is a way to put a
Hello everyone,
On Sat, Aug 20, 2011 at 6:04 PM, Nick Dokos wrote:
> And emacs has the emerge tool already built in. In fact, Chacon
> mentions emerge as one of the presets in git, so it may be even
> simpler than what he describes.
When there is a conflict, this should work:
$ git mergetool
Andrea Crotti wrote:
> On 08/18/2011 12:45 PM, Carsten Dominik wrote:
> > 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-
On 08/20/2011 04:42 PM, Carsten Dominik wrote:
I have no idea, but I would think that it could also be written in Perl,
for example.
Yes from what I understand from the source it can be any executable
that outputs things as git expects them.
There are no compile time dependencies on git as far
On 20.8.2011, at 16:17, Andrea Crotti wrote:
> On 08/18/2011 12:45 PM, Carsten Dominik wrote:
>> 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=blo
On 08/18/2011 12:45 PM, Carsten Dominik wrote:
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 fi
