Re: [PATCH 1/2] Handle core.symlinks=false case in merge-recursive.

Johannes Schindelin <Johannes.Schindelin@xxxxxx> · Sat, 3 Mar 2007 21:11:58 +0100 (CET)

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