Merging Files and Revisions

To merge files or revisions:

  1. Right-click the file you want to merge in the Solution Explorer and select Merge. The Merge wizard appears.

  2. Choose the Item-based merge option to merge a specific revision of the selected file. Select the revision from the drop-down list.

  3. Choose the File-based merge option to merge the working file with another file.

  4. Click Next.

  5. On the Merge Target screen, choose from the following options:

  6. On the Select the revision and/or files to merge with screen, choose from the following options:

  7. Click Next.

  8. On the Set merge options screen, optionally do any of the following:

  9. Click Next.

  10. On the Modify target attributes screen, set any item attributes as needed for your development process.

  11. Click Next to review the options set for the merge, and click Finish.