To merge files or revisions:
Right-click the file you want to merge in the Solution Explorer and select Merge. The Merge wizard appears.
Choose the Item-based merge option to merge a specific revision of the selected file. Select the revision from the drop-down list.
Choose the File-based merge option to merge the working file with another file.
On the Merge Target screen, choose from the following options:
Create a new revision to check the merged file in as a new revision. If you choose this option, enter a named branch and revision number for the new revision.
Mark revisions as already merged with selected start revision to set the status to merged without checking in a new revision.
Merge to a file to create a new file with the merge results.
On the Select the revision and/or files to merge with screen, choose from the following options:
If you want to merge the file you selected with other revisions of the same file, choose the revisions from the Merge with these revisions list.
If you want to merge the file with other files, click the Add button and select the files to merge with. The files appear in the Merge with these files list.
On the Set merge options screen, optionally do any of the following:
Select a lifecycle status for the merged file from the Status list.
In the Request ID field, enter or browse to select a request to associate with the merged file.
Enter a description of the file merge in the Reason for item merge field.
On the Modify target attributes screen, set any item attributes as needed for your development process.
Click Next to review the options set for the merge, and click Finish.