Posts
1150
Comments
891
Trackbacks
1
TF203015: the item blah has an incompatible pending change

Ran into this recently, so leaving myself a note.

The posts I saw all had to do with shelve sets, but it appears to happen with regular branches as well.  Sometimes, when you delete a file in two branches, and merge one of them in, when you later try to merge the other one in, TFS appears to get ‘confused’ and won’t let you check in, giving you this message.  At least I think that is what it is.

The fix is to undo the changes in that 2nd branch, and then you can check in.

posted on Monday, September 09, 2013 10:46 AM Print
Comments
No comments posted yet.

Post Comment

Title *
Name *
Email
Url
Comment *  
Please add 1 and 8 and type the answer here: