From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rasmus <rasmus@gmx.us>
Subject: Re: Google Summer of Code -- 3 Org projects for our first
 participation!
Date: Wed, 25 Apr 2012 00:16:54 +0100
Message-ID: <874ns83el5.fsf@pank.eu>
References: <8762cpad2q.fsf@gnu.org> <87ipgp4fr9.fsf@pank.eu>
	<87r4vdc5v4.fsf@Rainer.invalid>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
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]:55215)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rasmus@gmx.us>) id 1SMov2-0002Du-Ug
	for emacs-orgmode@gnu.org; Tue, 24 Apr 2012 19:13:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rasmus@gmx.us>) id 1SMov0-0006jG-4k
	for emacs-orgmode@gnu.org; Tue, 24 Apr 2012 19:13:12 -0400
Received: from mailout-eu.gmx.com ([213.165.64.42]:47028)
	by eggs.gnu.org with smtp (Exim 4.71) (envelope-from <rasmus@gmx.us>)
	id 1SMouz-0006iX-Qp
	for emacs-orgmode@gnu.org; Tue, 24 Apr 2012 19:13:10 -0400
In-Reply-To: <87r4vdc5v4.fsf@Rainer.invalid> (Achim Gratz's message of "Tue,
	24 Apr 2012 21:00:31 +0200")
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: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org

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.=20=20

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.

=E2=80=93Rasmus

--=20
Don't panic!!!