> "git reset --hard" is not suggested, because it potentially removes > changes unrelated to the merge (if the work tree was dirty prior to > the merge). Sorry could you just clarify... if the user does "git reset HEAD" will that sometimes always or never fail? If it sometimes or always fails, then doesn't it seem kinda confusing if the user is told to run that command, but then when they do they get an error? John -- 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