Search code examples
tfsmergebranchtfvc

TFS dividing merge into parts

Let's assume I have 2 branches: Dev and Prod.

For example, I've changed FileA.cs and FileB.cs in Dev. I've launched merge from Dev to Prod, and now have both files in pending changes.

But, at the moment I want to push to Prod FileA.cs only. And FileB.cs should be pushed later.

The question is, what should I do with pending change for FileB.cs? If I will undo it, will this change appear again for next merge?

Solution

  • You can exclude (right click the file, select exclude)FileB.cs in the pending changes. This is just like hangs on the file.

    enter image description here

    When you need it, just included the FileB.cs back again.

    Moreover, if you undo it, this change will still appear again for next merge.