Accepting incoming change sets

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.

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.

Procedure

  • To accept all incoming change sets, in the Pending Changes view, right-click the repository workspace. Then, click Accept.
  • To accept individual incoming change sets:
    1. 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.
    2. To accept the incoming change set into your repository workspace, right-click the change set and click Accept.
  • From your host application, you can accept incoming changes through the MS-SCCI SccGet API.