/ March 31, 2015
So you've been working away on some code, and it works great. You then rebase on master, and it breaks.
aarrgghhhh!!!! Steam-from-the-ears!!! pulling-of-hair!!!
Until now, I'd either be checkoing out one branch at a time & testing, or doing some kind of cherry-picking into a new branch - either way, it's a pain keeping track of what's working & what's not.