From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: [GSoC] org-merge-driver weekly update
Date: Wed, 30 May 2012 19:15:30 +0200
Message-ID: <FE9C1B33-25DD-4D35-8A4F-378B3C08AE4C@gmail.com>
References: <CAMvvmF8veZDh44bE03GVs8HwwDfFTej4nziUida_kWzSm6wBOg@mail.gmail.com>
Mime-Version: 1.0 (Apple Message framework v1278)
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:55477)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1SZmUM-0005Yf-67
	for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:15:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1SZmUK-0002yh-Cy
	for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:15:13 -0400
Received: from mail-we0-f169.google.com ([74.125.82.169]:41708)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1SZmUK-0002xu-4G
	for emacs-orgmode@gnu.org; Wed, 30 May 2012 13:15:12 -0400
Received: by wefh52 with SMTP id h52so40092wef.0
	for <emacs-orgmode@gnu.org>; Wed, 30 May 2012 10:15:09 -0700 (PDT)
In-Reply-To: <CAMvvmF8veZDh44bE03GVs8HwwDfFTej4nziUida_kWzSm6wBOg@mail.gmail.com>
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: <http://lists.gnu.org/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: Andrew Young <youngar17@gmail.com>
Cc: emacs-orgmode@gnu.org

Hi Andrew,

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

> Hello everyone,
>=20
> 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! ;)
>=20
> 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-to=
ol/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=