Resolving conflicts

Conflicts arise when incoming and outgoing change sets exist in your workspace, and both change sets affect one or more of the same files. These conflicts need to be resolved to ensure that everyone on your team is working with the same set of files.

About this task

If you have incoming and outgoing change sets that cause conflicts, the Repository Workspaces panel shows a symbol next to the workspace name. The symbol for unresolved conflicts in your workspace is exclamation point (!)

Procedure

On the Unresolved Conflicts panel, specify an external data set prefix and a z/OS® UNIX directory for saving a backup copy of the member or UNIX file in conflict. You can enter a forward slash (/) next to a conflict to see a menu of actions, or you can enter one of the following actions:
  1. To resolve the conflict by using the version of the file in your workspace and the outgoing change set, enter an M and press the Enter key.
  2. To resolve the conflict by using the version of the file in the incoming change set, which overwrites the version in your workspace, enter a P and press the Enter key.
  3. To compare the local file in your sandbox to the remote file in a temporary data set, enter C and press the Enter key.

    Comparing the file opens the file in an editor session. Changes in the local and remote files are noted in the editor, along with instructions to identify in which file the differences exist. You can use the information about the changes in the files to merge the local and remote file changes as you want to include them.

    The conflict is resolved by using the result of your merge.
  4. To compare, in ASCII, the local file in your sandbox to the remote file in a temporary data set, enter CA and press the Enter key.

    Comparing the file opens the file in an editor session. Changes in the local and remote files are noted in the editor, along with instructions to identify the file in which the differences exist. You can use the information about the changes in the files to merge the local and remote file changes, as needed.

    The conflict is resolved by using the result of your merge.
  5. To view the local file that is stored in your local data sets, enter L.
  6. To view the local file that is stored in your local data sets in ASCII format, enter an LA.
  7. To view the local file that is stored in your local data sets in UTF-8 format, enter LU.
  8. To view the remote file in a temporary data set, enter R.
  9. To view the remote file in a temporary data set in ASCII format, enter RA.
  10. To view the remote file in a temporary data set in UTF-8 format, enter RU.

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