PROBLEM: Merging two branches in TFS2012 and it fails saying there are 0 errors but X warnings - refer to Output window for details. When you check the Output window you see:
"TF203015: The item $/XXX/YYY has an incompatible pending change"
SOLUTION: In my case, it was because the file in the changeset I wanted to merge (web.config) had pending changes in the target branch which had been added to "Excluded Changes". In my case I moved the file to "Included Changes" and Checked In the changeset (so the server knew). Then I was able to merge my two branches. I think if I had discarded my changes on the target branch for that file it would have potentially resulted in the same effect. Some other googling showed that sometimes people had this issue due to file permissions but that wasn't the issue in my case. That's a few hours of my life I'll never get back!
No comments:
Post a Comment