Update a work area from requests
In the Visual Studio IDE, you can update your local work area with items that are related to specific requests. This way, you limit the update to the changes that are associated with the requests.
The operation is similar to updating a work area from a stream.
For details about merging conflicts, see Merge conflicts and synchronize streams.
To update your local work area:
- Select the requests that you want to update from, right-click, and select Update from Request. The Update Work Area from Request wizard opens. The Update changes from this stream box displays the name of the stream from which you invoked the update.
(Optional) In the Update changes from the request(s), add more requests to update from. Enter request IDs separated with a comma. To specify different requests, click Select and use the Request Selection wizard to select a product and requests.
Note: The requests must contain changes delivered to the same stream.
- (Optional) In the Update this work area box, change the work area path to update. Enter a new path, or click Select and choose an area.
- To interactively (manually) verify the results of any file merge operation before applying them to the work area, select Perform an interactive update.
- To include item revisions related to child requests, select Also include items related to child requests.
- For advanced options, click Advanced.
To update only specific files or folders, enter wildcard filters for including or excluding files. For details, see Include and exclude files and folders.
To apply the repository date and time to the updated files in the work area, select Apply repository date and time.
Select Expand substitution variables if required. For details about item header substitution, see Use header substitution variables.
To automatically merge local and repository files whose content does not conflict, select Auto merge non-conflicting file content. You can also select a default character set that is used to transcode Unicode files before merging.
Do one of the following:
- If you are performing an interactive update, click Next and go to the next step.
- If you are not performing an interactive update, click Update. The work area is updated and the results are displayed.
- On the Review Changes page expand the folder tree to display the changes that have been identified.
On the toolbar select a resolution for each conflict:
Ignore Ignore a change. Use Local Use the version of the change in the work area. Use Repository Use the version of the change in the repository.
Click Update. The results of the update operation are displayed.
If a conflict includes path differences, you can select to use local path or repository path.
Your selection is displayed in the Resolution column.
Caution: If you select Use Local or Use Repository, you may discard a change that you want to keep.
To merge the content of two file revisions that are in conflict, click Merge. The default merge tool opens, displaying the content of the revisions. After you have completed the merge successfully and exited the merge tool, the resolution is displayed as Merge.