I stupidly merged a feature directly into master, then tried to revert that merge commit. This worked, but it meant that when I eventually correctly merged the feature to dev and then dev into master, master didn't actually have the feature as the revert commit was still in the master's history (but not in devs). This meant I had to revert the revert in master 🤕
I stupidly merged a feature directly into master, then tried to revert that merge commit. This worked, but it meant that when I eventually correctly merged the feature to dev and then dev into master, master didn't actually have the feature as the revert commit was still in the master's history (but not in devs). This meant I had to revert the revert in master 🤕