emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: John Hendy <jw.hendy@gmail.com>
To: "Jason F. McBrayer" <jmcbray@carcosa.net>
Cc: emacs-orgmode@gnu.org
Subject: Re: Kudos to Auréliens and Andrew who finished the GSoC successfully!
Date: Wed, 29 Aug 2012 09:33:42 -0500	[thread overview]
Message-ID: <CA+M2ft8eWnE+GwXG028doQPufDtAiBoB+Py0ihFTdO7+coPEPQ@mail.gmail.com> (raw)
In-Reply-To: <e6207a2b2a04a2a8859f99847c0d894d@marie.carcosa.net>

On Wed, Aug 29, 2012 at 7:28 AM, Jason F. McBrayer <jmcbray@carcosa.net> wrote:
> On 24.08.2012 12:11, Bastien wrote:
>
>> Andrew's Org Merge driver (put your own favorite music):
>> http://www.youtube.com/watch?v=GbaaFmoEfGw
>
>
> I'm fairly excited about the Org merge driver. It seems like a lot of
> the conflicts I get in merging my work and home repositories are
> things that a syntax-aware merge tool would handle correctly. I'm
> excited to see that it also works with Mercurial!
>

Flipping awesome video. I don't really edit from multiple locations,
but I can see how this will help tremendously with org-mode
collaboration.

Thanks for posting!
John

> --
> +-----------------------------------------------------------+
> | Jason F. McBrayer jmcbray@carcosa.net |
> | If someone conquers a thousand times a thousand others in |
> | battle, and someone else conquers himself, the latter one |
> | is the greatest of all conquerors. --- The Dhammapada |
>
>

      reply	other threads:[~2012-08-29 14:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-24 16:11 Kudos to Auréliens and Andrew who finished the GSoC successfully! Bastien
2012-08-25 12:26 ` Puneeth Chaganti
2012-08-27 16:15 ` Eric Schulte
2012-08-29 12:10   ` Aurélien Aptel
2012-08-29 17:26   ` Bastien
2012-08-29 22:39     ` Marcelo de Moraes Serpa
2012-08-29 12:28 ` Jason F. McBrayer
2012-08-29 14:33   ` John Hendy [this message]

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

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CA+M2ft8eWnE+GwXG028doQPufDtAiBoB+Py0ihFTdO7+coPEPQ@mail.gmail.com \
    --to=jw.hendy@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=jmcbray@carcosa.net \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).