Re: [O] [GSoC] org-merge-driver weekly update

[Carsten Dominik]

Hi Andrew,

On 30.5.2012, at 16:36, Andrew Young wrote:

> Hello everyone,
> 
> I would just like to let everyone know that a prototype for org-merge-driver 
> is available.  It is not complete, so of course please do not use it for your 
> repository! ;)
> 
> You can see some example use of it at the the worg project page: 
> http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/prototype.html


A nice start!

In your first example, it seems incorrect to me that "* A new heading in file 2"
ends up being the first top-level headline in the merged file.  It is added as
second in file two, so I clearly would expect it to appear as second in the 
merged file.

Greetings

- Carsten

P.S.  Bastien, should comments and discussions like this one be on the list, or 
off list?

- Carsten