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

TFS doesn't allow you to merge multiple non-contiguous changesets if the same file is changed in both of them. Your best option is to checkin the first set of changes, then do the merge.