Merging conflicts
The project that I’m on has a biannual release schedule, so we’re in crunch mode to hit the next release thats coming up in the next couple weeks. I’ve been working late, but some other guys have been working even later; I’ve gotten build emails at midnight this week.
I just wanted to relay a funny thing that happened this week. I was working on a file that someone else was working on too, so I just manually made the file writable (we use source safe) and made my modifications. After I got his changes, I used WinMerge to merge our changes together and checked the result in.
Of course, I screwed up the merge and overwrote his changes. He emailed me later and said “Hey! You overwrote my code!”, so I apologized and merged the code correctly and got it all squared away.
After explaining to him what had happened, that I thought I had merged it correctly, he replied with this email:
“The best WinMerge is in your head 
”
That’s so true.
