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

It is enough to check-in the folder that you are going to branch to.

In my case I created a new folder in my target branch and it was on the "Add" state (without check-in) and I had this same problem. After I checked in this folder it worked well.