Because I So Love To Merge

Today, I tried merging the locking version -- which includes later changes from the current main line and two DLLs of mine that someone else thoughtfully deleted from the project and which I had to restore -- to my current working line where I'm trying to merge a bunch of changes from a three year old line where I was working on something. Unfortunately, something has gone wrong and I now have "evil twin" files for a bunch of the files that I restored to the locking version.

*thud* *thud* *thud*

Tomorrow, I'll try deleting the duplicates and see if I can keep the versions from the locking line. Maybe that will work...