From: Rasmus <rasmus@gmx.us>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: Google Summer of Code -- 3 Org projects for our first participation!
Date: Wed, 25 Apr 2012 00:16:54 +0100 [thread overview]
Message-ID: <874ns83el5.fsf@pank.eu> (raw)
In-Reply-To: <87r4vdc5v4.fsf@Rainer.invalid> (Achim Gratz's message of "Tue, 24 Apr 2012 21:00:31 +0200")
Achim Gratz <Stromeko@nexgo.de> writes:
> Rasmus writes:
>>> Emacs-Orgmode Git merge tool for Org Files (Andrew Young)
>>
>> Interesting. How would such a driver differentiate between normal
>> git?
>
> You can add any number of merge drivers to your git config. A merge
> driver is supposed to know about the expected content of the file
> types
> it gets registered for and be indeed more clever about merging than
> the
> standard merge algorithms.
Sounds like a real win for cooperative writing. Teaching people
'correct' VC behavior (in particular conflict resolution) is often more
challenging than, say, LaTeX/R/whatever.
This could be huge.
Would the `final' code be part of Org or Git-upstream? I am guessing
the latter for robustness.
–Rasmus
--
Don't panic!!!
next prev parent reply other threads:[~2012-04-24 23:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 5:55 Google Summer of Code -- 3 Org projects for our first participation! Bastien
2012-04-24 7:17 ` Carsten Dominik
2012-04-24 7:18 ` Ian Barton
2012-04-24 8:12 ` Thorsten
2012-04-26 1:42 ` Neil Smithline
2012-04-26 7:48 ` Thorsten Jolitz
2012-04-28 23:12 ` Neil Smithline
2012-04-26 7:57 ` Bastien
2012-04-28 23:30 ` Neil Smithline
2012-04-29 8:26 ` Bastien
2012-04-29 0:20 ` Neil Smithline
2012-04-29 8:22 ` Bastien
2012-05-05 0:19 ` Neil Smithline
2012-05-05 5:39 ` Bastien
2012-05-05 10:52 ` Bernt Hansen
2012-05-05 9:36 ` Nicolas Goaziou
2012-05-04 22:37 ` Neil Smithline
2012-05-04 21:04 ` Eric Schulte
2012-04-24 9:54 ` Rasmus
2012-04-24 19:00 ` Achim Gratz
2012-04-24 23:16 ` Rasmus [this message]
2012-04-26 8:19 ` Bastien
2012-04-24 11:29 ` Richard Riley
2012-04-24 14:19 ` Andrew Young
2012-05-08 3:42 ` Neil Smithline
2012-05-08 8:06 ` Thorsten Jolitz
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=874ns83el5.fsf@pank.eu \
--to=rasmus@gmx.us \
--cc=Stromeko@nexgo.de \
--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 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).