From: Jon Loeliger <jdl@freescale.com>
Date: Wed, 29 Nov 2006 20:37:57 GMT
Subject: Re: git and bzr
Message-ID: <1164832677.4724.60.camel@cashmere.sps.mot.com>
In-Reply-To: <Pine.LNX.4.63.0611291145510.30004@wbgn013.biozentrum.uni-wuerzburg.de>

On Wed, 2006-11-29 at 04:49, Johannes Schindelin wrote:

> As for your scenario: There really should be a "what to do when my merge 
> screwed up?" document.

I have a few examples scenarios and some notes on
cleaning up after failed merges in my slides from
the presentation I did at OLS last summer.

Feel free to look at it off of www.jdl.com!

jdl