From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 03 Mar 2007 20:11:58 GMT
Subject: Re: [PATCH 1/2] Handle core.symlinks=false case in merge-recursive.
Message-ID: <Pine.LNX.4.63.0703032110200.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <200703032032.47158.johannes.sixt@telecom.at>

Hi,

On Sat, 3 Mar 2007, Johannes Sixt wrote:

> If the file system does not support symbolic links 
> (core.symlinks=false), merge-recursive must write the merged symbolic 
> link text into a regular file.

I think regardless of the value of core.symlinks, merging symbolic links 
does not make sense at all.

I'd suggest having two versions of the symlöink/file, <name>Ã~ours and 
<name>~theirs instead.

Ciao,
Dscho