Never merge a risky feature till YOU are ready to deploy and babysit it

This is part of the Semicolon&Sons Code Diary - consisting of lessons learned on the job. You're in the git category.

Last Updated: 2024-03-02

I had finished the rewrite_tutor branch, a complicated change that required a careful deploy, and merged it into master, even though I was finishing the day and had no intention of deploying it until tomorrow.

As luck would have it, that evening I noticed I was getting 1000's of exceptions for unrelated causes. But I could not put a hotfix on master, because that would necessitate a deploy of this new rewrite_tutor tutor code, which I didn't want to deal with right now.

I got around by reverting the merge (and choosing to keep a particular side of the master - the one I was merging into) $ git revert -m 1 sha1