There's A Trick To This

[billroper]

I finally finished rebasing my branch in Git today. Given the amount of pain I went through, I conclude that rebasing in Git is a bit of a black art. Either that or I made a bit of a mess the first time I tried rebasing this branch and paid for the mess this time around.

If it's the latter, then when I get around to rebasing the branch again at some future date, it should be simpler.

I hope.