Accepting incoming change sets in Advanced mode
Incoming change sets are the changes that your team members deliver to the current flow target of your repository workspace. The incoming change sets are displayed in the Incoming folder of the Pending Changes view.
About this task
When you check in changes, you add them to a change set that is associated with your repository workspace. You can continuously change files and check them in. The changes are in your repository workspace and are not shared with team members until you deliver the change set.
Check in changes to prevent them from being overwritten. If you accept changes that modify the files that you are working in before you check your changes into your repository workspace, your changes are overwritten. If your changes are checked in and they conflict with incoming changes, you can use merge tools to resolve the conflict so that you can keep the incoming changes and your changes. If the accept operation results in file conflicts, the conflict icon is displayed on those files. To resolve conflicts, use the Pending Changes view.
Also check in changes to back them up. Then, if you lose files on your file system, you can reload your sandbox and synchronize with your repository workspace.
- To accept all incoming change sets, in the Pending Changes
view, right-click the repository workspace. Then, click Accept.
Tip: To accept all incoming change sets using the Engineering Workflow Management Shell tray icon, right-click the icon; then click . You can also accept individual change sets that are associated with a work item from the Work Item History folder in the Team Artifacts view.
- To accept individual incoming change sets:
- In the Pending Changes view, navigate to the Incoming folder of the component and review the change sets. To learn more about a change set, open the work item that is associated with the change set. If the change set includes a potential conflict, an orange icon is displayed beside the folder that contains the conflict.
- To accept the incoming change set into your repository workspace, right-click the change set and click Accept.
To accept changes in a Windows Explorer window, navigate to the file or
folder with the incoming changes in your sandbox. Right-click on the file or folder; then click .
Note: An incoming overlay displays on a file if there are incoming changes. If the incoming changes affect more than your selection, a warning is displayed. If accepting the incoming changes results in a conflict, then you are advised to attempt to accept changes from the Pending Changes view to resolve the conflict.