From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Young <youngar17@gmail.com>
Subject: [GSoC] Org Merge Driver Update
Date: Mon, 13 Aug 2012 19:15:52 -0400
Message-ID: <CAMvvmF-1y74Fr=JYyA8+UE7qy4gnpn6w5rB5WKbzQkiqGkz9Gw@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:45856)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <youngar17@gmail.com>) id 1T13rX-0006dR-7k
	for emacs-orgmode@gnu.org; Mon, 13 Aug 2012 19:15:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <youngar17@gmail.com>) id 1T13rV-0005qj-UL
	for emacs-orgmode@gnu.org; Mon, 13 Aug 2012 19:15:55 -0400
Received: from mail-wi0-f171.google.com ([209.85.212.171]:50372)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <youngar17@gmail.com>) id 1T13rV-0005or-O2
	for emacs-orgmode@gnu.org; Mon, 13 Aug 2012 19:15:53 -0400
Received: by wibhq4 with SMTP id hq4so3150918wib.12
	for <emacs-orgmode@gnu.org>; Mon, 13 Aug 2012 16:15:53 -0700 (PDT)
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: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>

Hello Everyone,

I've been working on a merge driver for org-mode documents over the
summer as a Google Summer of Code project. I just wanted to show
everyone some progress on the merge driver.

There are some new examples you can see at the project page [1][2], and
instructions on how to build and use it.

the source is available here: git clone git://orgmode.org/org-merge-driver.git

I'd really appreciate if anyone could take the merge driver out for a
test spin, and come back with any kind of feedback, such as:

- file output
- customization
- the user interface
- the merging rules
- new features and element specific support
- testing
- neat ideas, etc.

There is only about a week left in GSoC, but I'm planning to continue to
develop the merge driver past the end of GSoC.

Please take a look, and thanks,

Andrew Young

[1] project page:
http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/
[2] examples:
http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/examples.html