From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Tue, 23 Oct 2007 16:19:42 GMT
Subject: Re: unmerging feature branches
Message-ID: <vpqejflolb5.fsf@bauges.imag.fr>
In-Reply-To: <20071023152445.GA10070@piper.oerlikon.madduck.net>

martin f krafft <madduck@madduck.net> writes:

> Now I woul like to undo the merge.

Dirty solution: export the patch corresponding to the merge (diff
M..M^), and apply it on master. If you have no conflicts, it should be
doable. If you have conflicts, it will probably be painfull.

-- 
Matthieu