Sorry for the capitals, I have spent all day dealing with stupid TFS instead of actually doing development work.
I have a main branch and a dev branch. I merged changes from the main branch up into the dev branch fine. Now when I try merging up again it says there is nothing to merge.
HOWEVER, when I merge down from the dev branch to the main branch, it magically decides that a bunch of files have differences (which are only present in the main branch). Why does it decide this? Because TFS is comparing using the wrong changelist version from the dev branch!!! It is using the second to last changelist, not the latest one like I asked! What the heck is going on?
Sure I could resolve this by doing a force merge, but then every file in main would be marked as changed when it actually hasn't. What I want is for TFS to actually WORK in a logical way, is that too much to ask?