Re: SEGV in git-merge recursive:

Hi,

On Fri, 30 Mar 2007, Linus Torvalds wrote:

On Fri, 30 Mar 2007, Johannes Schindelin wrote:

quoted

IMHO, there is actually no way merge_trees() can fix the conflicts 
enough to write a tree.

So, the only way I see to avoid that SEGV is to something like this:

I disagree.

It's much better to give a bad intermediate tree than to give up entirely.

Hmm.

What we _could_ do: if the index still contains unmerged entries, then we 
collapse these into files with conflict markers (in case the file cannot 
be written, because a directory of the same name exists, we have to save 
with a unique name, complaining loudly about it, i.e. without using 
output()).

I will not have time to implement this until later this week, though.

Ciao,
Dscho