When a git branch goes bad
Want to merge some good code into the master branch, but stymied by code you don’t care about causing a bunch of conflicts?The other day, some crap got committed to master and pushed, accidentally. It didn’t belong. Since it was pushed to origin, we don’t want to change history*. When it was time to do …