TFS merge changeset into file with pending change

Question

I have a feeling this is a very stupid question, but I can\'t find the answer anywhere.

So we have a Dev branch and a QA branch. I merge a bunch of contiguous change

Answer 1

I had the same problem. I did undo all the pending local changes and un-shelved the pending changes. It fixed my problems.