Special considerations for rebasing in a single-stream project

Special considerations apply to rebasing in a view belonging to the integration stream of a single-stream project. This is the development work area for all members of the single-stream project.

If you start the rebase operation from the graphical user interface and rebase detects a checked-out element, a window opens warning you of the conflict. To continue the rebase operation, click Continue to resume the rebase or click Close to stop the rebase and resume later.

The element logs display additional information about the conflicting checkouts, for example, the view and the name of the user who checked out the file.

If you perform the rebase operation from the command line and rebase detects any checked-out element, the rebase warns you of the conflict. Rebase continues processing the remaining elements and merges all directories and files possible. Then the rebase interrupts to allow you to resolve any checkout and merge issues, after which you need to resume the rebase.