From: Junio C Hamano <junkio@cox.net>
Date: Thu, 18 May 2006 06:44:15 GMT
Subject: Re: Necessity of "evil" merge and topic branches
Message-ID: <7vu07n6dds.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vy7wz6e8c.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> 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.