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. -- 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