I’ve tried baseless merges, forced merges, regular merges…. nothing ever “takes” (even though the changes TO get committed, TFS keeps thinking there are unresolved changes that need to be merged next time I do a merge).
Here are some screen shots of the crazy merges I’m trying with the 2 issues that never resolve. Click for bigger picture:
UPDATE: I think we’ve resolved the problem. There was a nonexistant file that had a mystery pending change that would never get resolved. I undeleted it, merged this change into the file, then deleted it again, and merged that change doing a baseless merge, and it seemed to go away.