Fixed Bad Merge and Changing APIs
This afternoon I needed to fix up a huge merge that a co-worker did right before leaving for a two week vacation. He did all he could with Git, and he tried, to be sure, but his codebase had a lot of problems in it, and they needed to be fixed up before I released it to UAT and production this evening. While I can certainly understand misnamed methods, I was more than a little miffed at the API changes that I got as well.
Specifically, because of the code paths, an API change that only happened in development, and only when retrying saves. The code used to require an array of merchants - even if it's just one, and the new method worked without the array on a single merchant. Since this was really an API, the normal code worked when passing it the array - but not when in development. Then again, it was only hit on the retries.
It was a really frustrating time because I've been on the "business end" of a lot of folks leaving systems to me, and the carnage that ensues. It's not pretty. And in this codebase, where comments are seen as a weakness, it's orders of magnitude worse.
But in the end, I got it all squared away and deployed. I just wish it weren't so much effort a lot of the time.