In my main project at work, I recently had to kill a feature that wasn't panning out, but the topic branch for it included a lot of other valuable work I wanted to save. If I'd been smart, I would have spread this work out onto multiple subtopic branches, but I didn't do that, so now I have to dismantle the One Giant Branch for the feature and split it into those subtopics I should have had all along so I can get them merged back into the trunk without the bad parts of the topic.
