TFVC

When you are working with TFVC, you prepare a merge locally by choosing both a source and target branch and then picking the list of changes you want to merge. TFVC will then execute the merge and show you the changes that are the consequence of this merge as local changes. You can go over these changes, correct or change them, and must resolve any conflicts. After this, you commit the changes just as you would any regular change.