Junio C Hamano <gitster@xxxxxxxxx> writes: > Vincent van Ravesteijn <vfr@xxxxxxx> writes: > >> No, I turned rerere.autoupdate off. Proven in the above by the line >> "Resolved... " instead of "Staged...". > > Yeah, actually I just tried and the procedure works with or without > autoupdate for me. > > So there is something different between our setup (or the nature of the > conflict), but I do not know what it is offhand. The last message from me on this topic for now as I'll be a bit too busy, but a wild guess/hunch: grep NEEDSWORK near rerere.c::handle_cache()? I suspect that we might need to also update this function to handle "both sides added, but differently" case, as we do so in check_one_conflict() these days, but for Vincent's particular case that shouldn't be the cause. -- 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