Accepting and discarding changes made by other team members

In a collaborative development environment, other team members change resources that are in the same project area that you are working in. To import into your workspace the changes that they made, use the Accept incoming changes operation.

Before you begin

  • You should be familiar with project areas, configuration spaces, snapshots, workspaces, and change sets, which are described in Management of shared resources.
  • You must be logged in to a project, and you must be in a workspace that is associated with the current configuration space.
  • This content applies to version 4.0.3 or later. In the Configuration Management application, you must have permission to merge configurations. For more information about setting permissions in the Configuration Management application, see the link to the related task at the end of this topic.

Procedure

  1. Open the workspace to accept the changes into. On the toolbar of a lifecycle management product, click Current Configuration Context and click Open Current Configuration to open the current workspace, or click Explore Configurations, and open a different workspace.
  2. In the workspace editor, on the toolbar near the upper-right corner of the page, click the Accept Incoming Changes icon.
  3. On the Accept Incoming Changes page, view the highlighted changes in each pane. The Target pane in the lower-right section of the page displays each change that you can accept or reject.
  4. To accept a change, on the toolbar of the Current pane, click the Apply the change to the merged result icon.
  5. Optional: To accept all the changes simultaneously, on the toolbar of the Result pane, which is near the upper-right corner of the page, click the Accept all resolvable differences icon.
  6. After you accept the changes, commit your changes to the workspace: On the toolbar of the Result pane, click the Share merged result icon. If you do not accept an incoming change, your workspace contains a version of a resource that differs from the resource in the flow target. You might need to verify that this change is not necessary for your workspace.
  7. Optional: To discard the changes that you accepted while you were working on the Accept Incoming Changes page, on the toolbar of the Result pane, click the Discard merged result and close session icon. All updates to the current workspace are discarded.

Results

Your workspace now contains the changes that you accepted from other team members.

Feedback