fixing foobared merge with --record-only

I have foobared the branch and cannot merge it anymore. The main trunk is the next release; the branch (v0.9.4) is the current code in which I am fixing bugs and releasing point releases, like v0.9.4.1, v0.9.4.2, etc. I believe where I made mistake here: When I release code, I tag the v0.9.4 bran

Re: Rectifying a foobar split/merger

On Mon, Jun 14, 2010 at 4:35 AM, Cooke, Mark wrote: >> -Original Message- >> From: scarle...@gmail.com >> Sent: 14 June 2010 01:19 >> Subject: Rectifying a foobar split/merger >> >> I have foobared the branch and cannot merge it anymore.  The >> main trunk is the next release; the branch (

Rectifying a foobar split/merger

I have foobared the branch and cannot merge it anymore. The main trunk is the next release; the branch (v0.9.4) is the current code in which I am fixing bugs and releasing point releases, like v0.9.4.1, v0.9.4.2, etc. I believe where I made mistake here: When I release code, I tag the v0.9.4 bran