My source code branch contains almost 20000 files. I created a branch a couple of months ago called, "v2.5TEMP", which was branched off the "Main" trunk. Developers were working in both branches.
I then renamed "v2.5TEMP" to simply "v2.5." People have been working on this version which has now been released. I'm trying to merge from the v2.5 into the "Main" trunk, and am seeing every single file marked as requiring a merge.
Looking at the check ins over the …