From: Andrew Young <youngar17@gmail.com>
To: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>
Subject: [GSoC] Org Merge Driver Update
Date: Mon, 13 Aug 2012 19:15:52 -0400 [thread overview]
Message-ID: <CAMvvmF-1y74Fr=JYyA8+UE7qy4gnpn6w5rB5WKbzQkiqGkz9Gw@mail.gmail.com> (raw)
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
next reply other threads:[~2012-08-13 23:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 23:15 Andrew Young [this message]
2012-08-15 17:04 ` [GSoC] Org Merge Driver Update Eric Schulte
2012-08-15 19:22 ` Bastien
2012-08-15 20:15 ` Rasmus
2012-08-16 10:27 ` Andrew Young
2012-08-16 14:34 ` Eric Schulte
2012-08-18 2:09 ` Simon Thum
2012-08-18 8:24 ` Andrew Young
2012-08-26 0:23 ` Simon Thum
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMvvmF-1y74Fr=JYyA8+UE7qy4gnpn6w5rB5WKbzQkiqGkz9Gw@mail.gmail.com' \
--to=youngar17@gmail.com \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.