From: Ron Eggler <ron.eggler@gmail.com>
Date: Mon, 28 Nov 2011 19:30:59 GMT
Subject: RE: Copy branch into master
Message-ID: <CB09450076EA444CA289CDCB995F16A4@bny.us.bosch.com>
In-Reply-To: <20111128192659.GD29503@foghorn.codeweavers.com>

> Sorry, I have no idea how to use any of the GUI tools. Perhaps your
> GUI tool has a mailing list where you can ask about merge conflict
> resolution?

No problem, I actually got it all figured out now, and got my branch
smoothly merged back into master.
Thanks for your help!

Ron