Merge conflict resulting from rebase operation

A version that is created as a result of the rebase operation cannot be automatically merged with another version in the stream.

Items in the window

Element list
Lists the elements for which merge conflicts exist.
Start the diffmerge tool for this element
Starts the Diff Merge tool for the selected element.
Skip this element
Proceeds to the next element in the list.
Backout from the current Rebase
Cancels the current rebase operation, undoing any changes made so far.
OK
Click to confirm your selection.

Feedback