CODEWITHSUNDEEP
visual-studio-2015tfscheckin
TTT
TTT

Reputation: 1885

TFS unresolvable conflict?

(Using Visual Studio Professional 2015)

I'm am trying to check in a *.js to our TFS. The "Resolve conflict" windows shows this file as conflict and offers me only two choices "Take Server Version" and "Keep Local Version".

What I would like to do is "Keep Local Version".

If I click "Keep Local Version", I get

Error One or more warnings occurred while resolving. Full information on these warnings is available in the Output Window.

In Output Window:

The item [My item] already has pending changes.

If I click "Keep Server Version", I get The file is deleted from my local environment. (I checked and at this point, this file doesn't exist on TFS nor in my local environment. Then recreate it, I get back at the starting point of this question.

This happens since some time ago, on of my colleagues moved a lot files/folders into a subfolder. But all conflicts/problems have been solved since then. Only this files keep causing problem.

Upvotes: 0

Views: 722

Answers (1)

NextInLine
NextInLine

Reputation: 2204

TFS uses the path of the file as its unique identifier. There are sometimes issues that arise with this, particularly if files are moved in a different branch. Try deleting the file, submitting that change, then re-adding it. Or try adding the file with a different name, and renaming it later.

Upvotes: 1

Related Questions