Workflow for merging gaps in change set history

The workflow for merging gaps accepts one change set at a time and, for change sets that contain gaps in history, creates a new change set that contains the equivalent changes. Also, a link is maintained between the original, or source, change set and the resulting change set.

This merge gap workflow has the following benefits:

Note: This workflow requires that the component that is being worked in is loaded into the local sandbox.

When an accept operation encounters a gap in change set history, you are prompted to merge the change set. You can merge the gap to resolve it:

  1. Any change sets that can be accepted directly are accepted.
  2. The first change set that is blocked due to a gap becomes the source change set of the current merge.
  3. The remaining change sets are added to the merge queue for the component.
  4. After the Gap editor opens, you can merge the changes from the source change set into a new resulting change set.
  5. Merge the changes that are not automatically resolved. The accept operation automatically merges as many changes as possible so that a minimal number of changes require manual merging.
  6. Inspect the resulting change set to ensure that the content merged properly.
  7. Complete the resulting change set.
    Note: In the Gap editor, you can select an option to create a link between the source and resulting change set to provide traceability between these change sets.
  8. If there are more change sets in the merge queue, you can reaccept those change sets. The remaining change sets might be accepted automatically and require no additional merging. If another gap is encountered, the process is restarted at the first step and repeated.

Conflict resolution for change sets with gaps in their history

The following table describes conflicts that can occur after you merge a change set with a gap in its history. Regardless of the type of conflict that you encounter after you click Merge in the Gap editor, a window opens and provides you with resolution options.

Conflict Description Resolution

Change detail

Modifications to a file or folder in a change set are represented in the Gap editor as one or more change details under the file or folder entry in the Changes to Merge section. The following types of change details can occur:

  • Content change
  • Content type change
  • Encoding change
  • Executable bit change
  • Line delimiter change
  • User property change
  • Move/rename change
  • Symbolic link change

Conflicts can occur for change details. For example, if the starting value for a property change does not match the value of the property in the target file before the change is applied, it is flagged as a conflict. Also, if a content change is not merged automatically, a conflict is displayed. These conflicts can be resolved in the following ways:

  • To ignore the value, click Ignore.
  • To accept the new value, click Accept.
  • For content changes, after you click Merge, the content opens in a compare editor. After you manually merge the content and save the file, in the Changes to Merge section, click Mark as Done.

Missing item

A file or folder exists in the source change set but does not exist in the target workspace.

In the Missing file window:

  • To ignore the change, click Ignore.
  • To accept the file or folder, click Add.

Name conflicts

A name conflict can occur if a change set includes a file or folder that has the same name as a different file or folder in the target workspace.

In the Missing File (or Folder) with Name Conflict window:

  • To ignore the change, click Ignore.
  • To accept the file, click Overwrite.

Deleted file or folder

A file or folder that was deleted in the source change set has a modification in the target workspace or can have a gap in its history.

In the File (or Folder) Deletion window:

  • To ignore the change, click Ignore.
  • To delete the file or folder, click Delete.
  • If the deleted resource is a file, you can click Open in Compare to view the file in the compare editor.

Deleted folder that is not empty

The source change set includes a deleted folder that has child items in the target workspace.

In the Folder Deletion window:

  • To ignore the deleted folder, click Ignore.
  • To delete the folder, click Delete, which removes the other child items from the target workspace.

Missing parent

A file or folder addition or a move in the source change set can reference a parent folder that does not exist in the target workspace.

In the File (or Folder) Addition with Missing Parent window:

  • To ignore the change, click Ignore.
  • To assign a new parent, click Set Parent Folder and select a new parent.

File add name conflict

A file addition or move in the source change set can collide with a file or folder in the target workspace.

In the File Addition with Name Conflict window

  • To ignore the change, click Ignore.
  • To add the file by overwriting the file or folder that exists in the target workspace, click Overwrite.

Folder add or move with name conflict

A folder addition or a move in the source change set can collide with a folder in the target workspace.

In the Folder Addition with Name Conflict window, to ignore the change, click Ignore.

To merge the existing folder with the proposed folder, click Merge. Merge the folder using the following rules:

  • If there is a folder conflict, the local folder is kept.
  • If there is a file conflict, the remote file is accepted and the local file is overwritten.
  • Non-conflicting files and folders are added.

Types of change details

The following screen capture shows the different types of change details and their corresponding icons.

Change details and corresponding icons.


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