Resolving an incoming change set

A change set is classified as incoming when it is present in a workspace flow target but not in the workspace itself.

About this task

If you have incoming change sets, the Repository Workspaces panel shows a symbol in front of the workspace name. The symbol for an incoming change set that can be accepted into the repository workspace is a less-than sign (<).
Note: A greater-than sign (>) indicates that there are also outgoing changes in the repository workspace that are ready to be delivered. If the workspace has both incoming and outgoing pending changes, that condition is shown by both symbols (<>). If the change sets include files that are present in both incoming and outgoing change sets, the symbols change to ><. The two symbols point toward each other to indicate that the incoming and outgoing changes conflict. The conflict is created when you accept the incoming change set. An exclamation point (!) indicates that the repository workspace contains unresolved conflicts.

Procedure

  1. On the Repository Workspaces panel, enter an I next to the workspace with the exclamation point (!) symbol in front of the workspace. In addition to incoming change sets on the Incoming Change Sets panel, you might also see incoming baselines. Incoming baselines are denoted by a BL in the first column.
  2. On the Incoming Change Sets panel, enter a forward slash (/) next to an incoming change set to see a menu of actions. You can also enter one of the following actions:
    1. To view the change set details, enter a V on the Incoming Change Sets panel. The Change Set Details panel opens.
      Note: You cannot view files for incoming baselines.
      On the Change Set Details panel, enter a forward slash (/) next to an incoming change set to see a menu of actions. You can also enter one of the following actions:
      • Enter L to view the local file that is stored in your local data set.
      • Enter LA to view the local file that is stored in your local data set in ASCII format.
      • Enter LU to view the local file that is stored in your local data set in UTF-8 format.
      • Enter R to view the remote file in a temporary data set.
      • Enter RA to view the remote file in a temporary data set in ASCII format.
      • Enter RU to view the remote file in a temporary data set in UTF-8 format.
      • Enter C to compare the local file in your sandbox to the remote file in a temporary data set.
      • Enter CA to compare, in ASCII, the local file in your sandbox to the remote file in a temporary data set.
      • Enter CU to compare, in UTF-8, the local file in your sandbox to the remote file in a temporary data set.

      Comparing the file opens the file in a view session. Changes in the local and remote files are noted, along with instructions to identify in which file the differences exist.

    2. To accept the incoming change set, enter an A on the Incoming Change Sets panel.
      Note:
      • If the incoming change set contains changes that will overwrite other local changes that have not been checked in, you see a warning panel. On the panel, you can take one of three actions:
        Check in and accept
        Your local changes are checked in and then the incoming change set is accepted.
        Accept
        The incoming change set is accepted without your local changes being checked in.
        Cancel
        The incoming change set is not accepted. The message Accept Failedis displayed. If you click the Accept Failed message, a list of the local changes that you have not checked in is displayed.
      • If unresolved conflicts result from accepting a change set, the conflicting files are not updated in the repository workspace or the sandbox.
        • When you return to the Repository Workspaces panel, the exclamation point (!) in the status area indicates that the repository workspace contains unresolved conflicts.
        • To resolve the conflicts that result from accepting the change set, proceed with the Unresolved Conflicts panel. For more information about conflict resolution, see Resolving conflicts.

video icon Video

Jazz.net channel
Software Education channel

learn icon Courses

IoT Academy
Skills Gateway

ask icon Community

Jazz.net
Jazz.net forums
Jazz.net library

support icon Support

IBM Support Community
Deployment wiki