Merging a file between SCM branches that is several thousand lines in size and has significant changes in both branches is a good way to have an unpleasant day, even if the SCM that's being used has good support for cross-branch merging.
I had to reinstall VS2010 at work and because I clearly didn't think this all the way through, forgot to save my autoexp.dat file before removing the old installation. And of course I didn't realise what had happened until I had to dig deeper into some Qt GUI code that wasn't quite working as expected, and of course I was prompted with the raw data.
Just came across a link to this link collection that I think will be useful to C++ programmers:
Let's just make a small change to the requirements, I mean, what could go wrong?
I just had the pleasure to do exactly that in a batch file. Some poking around technet gave me the following: