Anyone who is working in a team and using a half-decent version control system will have come across merging. If not, then you've been lucky. Merging conflicting files frustrates many developers. And I reckon that this is because there is a fear that the merge will not be performed properly, resulting in a loss of work. Today I came across the merge from hell. I performed some work for one of my clients, but the work was done against an old version of their source code. When they discovered this...