Junio C Hamano <junkio@xxxxxxx> writes: > Now, unlike "pu", I never rewind "next", so once I did this > "evil merge", I do not have to worry about this anymore while > the topic is still on "next". Side note. If an evil merge or other hand resolution needs to be done on a path that results in automerge conflicts, rerere often helps. I really should start advertising it a bit more. Unfortunatly, rerere does not even kick in in this case. - : 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