Another Git Catastrophe Cleaned Up
At that point I realized that
git-filter-branchalso provided a less peculiar way out of the pickle once we were in: Instead of using my merge driver approach, I could have filtered the original topic branch to produce just branch B, which would have rebased ontomasterjust fine.I was aware that
git-filter-branchwas not part of my personal toolkit, but I was unaware of the extent of my unawareness. I would have hoped that even if I hadn't known exactly how to use it, I would at least have been able to think of using it. I plan to set aside an hour or two soon to do nothing but mess around withgit-filter-branchso that next time something like this happens I can at least consider using it.
Update (2016-12-21): See also: Hacker News.
