CODEWITHSUNDEEP
tfsmergecheckouttfvc
azerty
azerty

Reputation: 23

TFVC Merge 2 branches

I want to merge 2 branches and I read that if I do the merge, it will be on my local machine tell I CheckIn my change. But will all the files that changed when I resolve the conflicts be checked out ? The branches are actually used by other developers so I don't want to block them.

Upvotes: 2

Views: 210

Answers (1)

PatrickLu-MSFT
PatrickLu-MSFT

Reputation: 51083

But will all the files that changed when I resolve the conflicts be checked out ?

Unless you are working on server workspace and turn off the multiple check out. Only with this situation, when you check out the branch from sever and do the merge, other developers will not be able to make changes on the branch you are working.

If you are working on local workspace or server workspace with multiple check out enable. Others could still work with that branch. They could still get files to local (local workspace) or check out files (server worksapce).

Besides, unless you finally check in your changes to server. They will not able to get the changes you have made.

Hope it's clearly.

Upvotes: 1

Related Questions