CODEWITHSUNDEEP
visual-studio-2010tfsmerge
sammarcow
sammarcow

Reputation: 2956

TFS 2010 unexpected output - merge Dev to Gold

A compare is run on server versions of source branch Dev to Target Branch Gold. No other pending changes exist for the team project aside 5 Files which differ between the 2 branches. A merge is performed from Dev to Gold, 1 conflict exists on a *.cs file, the change is saved with the merge tool.

When attempting to check in the changes on the gold branch following the merge, every single file within the Gold Branch has a pending merge, lock. Expected changes are the 5 files which differ. What is going on?

Upvotes: 1

Views: 51

Answers (1)

Jehan33
Jehan33

Reputation: 3780

This will happen when you are merging a renamed branch or doing baseless merge.

Upvotes: 1

Related Questions