Meticulous Merging: Hey, why not?
February 4th, 2008 linkabi9I hate having to piece together the code of my workmates, when they won’t do the same with my code. I error check and bug test everything that will be used at the company. Code must be tested thoroughly before it can be published to any live sites. Everyone knows this. When I find a bug, I will fix it. If an individual works from home, it is up to me to make sure that what is delivered to the office is usable.
It always strikes me as a little idiotic when someone forgoes the use of backups in there daily work cycle. Save your data somewhere else besides the box at your side. If you have need of information and it happens to be covered in a coffee spill or maybe it’s the victim of Zeus’ antics during a particularly violent storm then you’ll be glad of the foresight and labor it took to set up a backup system for your work.
I am an idiot. I didn’t listen to my own advice. I received some updated code from one of the monkeys that work from home. I didn’t think ahead, so I went through the process of merging the changes I had made to the base code with the changes he made. I overwrote most of my changes to the code without pausing to verify that he merged any of the fixes I made throughout the last couple of days. Now, I’m sitting here with a brick. It’s useless. Since I don’t have a backup, I have to go back and piece together my memories on what was wrong with the original code and how I solved each problem… it’s going to be a long week.