siliconfury wrote:An Indian twunt as checked in a file into source control that was in conflict. It's a 5000 line XML file with 125 differences. Fucked if I'm trawling through both files merging the changes.
You'll only appreciate what I mean when you've worked with eejits and source control.
In situations like that I revert the offending change with a suitable blame comment in the log, along the lines of "Reverted changeset X because it caused problem Y". If I feel generous I will tell the individual who screwed up what I have done, but most of the time I let them figure out what I did and why. People don't learn if you spoon feed them.