TF203015 The element $ / path / file has an incompatible pending change. When trying to disconnect

Question

I am using Visual Studio 2010 Pro against Team Server 2010, and I opened my project (apparently) as a solution from the repo, but I had to open it as a “website”. I discovered this during compilation, so I went to delay my new changes and deleted the project from my local disk, and then reopened the project from the source (this time as a website), and now I can not delete my files.

Is there any way around this? Did I jump something? Do I need to perform maintenance on the server?

I found this question on SO # 2332685 , but I don’t know what cache files it talks about (I'm on XP: \) EDIT: Found this link after posting the question, sorry for the delay in the study, still not fixed my problem

Of course, I can not find the error code for TF203015 anywhere, so there is no permission (hence the inclusion of the number in the header, right?)

EDIT: I should probably mention that these files were never checked in the first place. Does it matter? Can you postpone an unverified item? Is that what I did wrong?

EDIT: WHAP - FOUND! Use Undo for items that do not exist, as they appear in pending changes as checks.

Answer 1

Need to close, find the answer.

I deleted the files when I tried to reload the workspace, although I canceled the changes. Then VS2010 thought that these files were still waiting to be saved. I do not need this, so I had to figure out the "cancel" the changes in the pending changes.

Then I could refuse.

He thought that I had two ops (unhelve, commit-for-add) at a time, and I thought that I had only one op (unhelve).

Answer 2

This is a bit aside the OP question

You can get TF203015 by trying and batch merging multiple sets of changes from one branch to another without due care.

Consider a situation where you have a main connector and a DEV branch. You forked DEV from MAIN and worked hard on the function in DEV; checking work in DEV as you progress. Now go ahead a week or two. Now you are completely ready and want to return to MAIN.

Here, one of our developers gets into this error.

He worked on one solution for several weeks and periodically checked for changes in the DEV, so he wanted to combine an endless series of changesets in MAIN. Therefore, he selects the merge option, selects the first set of changes; merges without problems, and then immediately combined the next set of changes; and bang TF203015, and its very useless test in the output window; incompatible pending changes.

After a little turn, we now understand what is happening here; the first merger created the expected change in MAIN for a solution for developers. The next merge attempt was also changed to the same solution, which would require TFS to “queue” the second set of pending changes to the same files. He cannot do that.

Thus, in this case, TF203015 means; “There are already some files in the destination branch that are pending changes in this change set. Please allow and commit changes to the recipient branch before performing this merge operation”

Decision; after each merge operation, our developer checks the workspace for MAIN and captures the pending change caused by the merge, then returns to DEV and repeats.

Actually reasonable and simple, but masked by a very dumb error message.

Answer 3

You can use Team Foundation Server Power Tools March 2011 ( http://msdn.microsoft.com/en-us/vstudio/bb980963.aspx ), which includes the tfpt unshelve .

After installing Power Tools, open a Visual Studio command prompt, change to the directory containing the project of interest, and run the tfpt unshelve . It will be disabled and display a merge dialog to resolve conflicts.

I thank this blog post for helping me find this solution: http://fluentbytes.com/the-how-and-why-behind-tf203015-file-has-an-incompatible-change-while-unshelving-a-shelve -set

Answer 4

I had what seemed to be the same problem, but I created the branch after postponing the changes, and I wanted these changes not to be pushed to the new branch.

TFS cannot go to a different path than the path by which the shelf was created.

Solution: I did not return to the original branch, and then used instead of comparing to merge the changes from my original branch to a new branch and check.

Answer 5

It may also be that after creating the folder in "Test" and you want to combine with dev for testing, that you do not have a new folder structure registered in TFS - you may also receive this error message.

Therefore, this message error MAY occur without any changes to SHELVESETS, as well as for others coming from Google and finding this page.

Answer 6

This link solved my problem:

https://blogs.infosupport.com/the-how-and-why-behind-tf203015-lt-file-gt-has-an-incompatible-change-while-unshelving-a-shelve-set/

The reason for the expected changes in the same workspace created an incompatible change. So undo the pending changes and try unhelve. This should solve the problem.

Answer 7

If you have two branches MAIN (target) and DEV (source), now you want to merge DEV into MAIN, then all the files that you want to merge from your source should not be older than similar files in your target branch.

For example: you have a modified test.cs file in the DEV branch, modified on 03/14/2016. In your MAIN branch, you have test.cs modified on 03/15/2016. Thus, the target is newer than the source file, and you have TF203015.

Solution: Go to TFS Explorer in the conflict file and merge it explicitly. TFS will open the conflict manager, and you can combine the conflicts manually. After that, you can merge the selected set of changes.

Note. If you have more conflicts, you must go to each conflict file and merge it explicitly, so TFS opens the conflict manager and you can merge it manually.