"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > Junio C Hamano <junkio@xxxxxxx> wrote: >> After a pull that results in a conflicted merge, a new user >> often tries another "git pull" in desperation. When the index >> is unmerged, merge backends correctly bail out without touching >> either index nor the working tree, so this does not make the >> wound any worse. > > I've seen this many times too. I don't understand why users cannot > read output messages and realize the current command failed, but > they don't. *sigh* That is not user's fault. Tools should not make things worse when run more than once after they failed, and we do not either, so it is not a stupid behaviour on the user's part to do that. We just need to make sure that it is more clear to the user that pull after a conflicted pull is futile, which is what this patch does. - 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