Reading this was like watching a traffic accident in slow motion. I could hear myself yelling at the author as if he were a student driver: "Use filter-branch

Reading this was like watching a traffic accident in slow motion. I could hear myself yelling at the author as if he were a student driver: "Use filter-branch!!! Use filter-branch!!! NOOOOOOOO NOT merge union with manual deletes!!!" But... he went and did it anyways. Honestly, reading back through commit logs, you always find the part where the driver runs off the road, plows through a clearly marked gate, runs on a train track for a mile or two, then merges back onto the main street, carrying part of a mailbox and a deer carcass. You can fault git if you want, but it seems like some of these cases just arrive naturally no matter what cvs is used. It would be great to have a "git education" repo that contains situations just like these to work through... sort of a "drivers ed" for managing a repo.