Chris Shoemaker <c.shoemaker@xxxxxxx> writes: >> This changes merge-recursive to still warn but do the "binary" >> merge for such a path; leave the "our" version in the working >> tree, but still keep the path unmerged so that the user can sort >> it out. > > Very nice. Forgot to ask. I did this because you had trouble on #git yesterday and then at around the same time today somebody else had the same issue. Did this patch solve your problem? I do not think this has big risk of regression, but if it does not help anything there is no reason to put it in 1.5.3, so I am asking for a success report. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
