From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 11 Mar 2009 20:37:48 GMT
Subject: Re: Google Summer of Code 2009: GIT
Message-ID: <alpine.DEB.1.00.0903112136560.10279@pacific.mpi-cbg.de>
In-Reply-To: <alpine.DEB.1.10.0903111307050.16753@asgard.lang.hm>

Hi,

On Wed, 11 Mar 2009, david@lang.hm wrote:

> there are two types of helpers that can be written
> 
> 1. a low-level part that does the simple merges automaticaly and leaves 
>    behind appropriate conflict markers when it can't
> 
> [...]
> 
> 
> 2. after a conflict has taken place, a helper to work with the user to 
>    resolve the conflict

I thought that from my description on the wiki it was obvious that both 
are needed.

Ciao,
Dscho