Overview of the rebase process
The rebase process involves the following tasks:
- Prepare your work area. You need to prepare your work area before performing a rebase operation. This involves finding all your checkouts and checking them in because the rebase operation cannot start from a view that contains checkouts. You can also check for differences between the earlier checked-in version, and see the check-in comments.
- Start the rebase operation. You will be presented with the latest recommended baseline.
- Be prepared to perform merge operations. If another team member has modified and delivered a version of the same element you modified in your development stream, you will have to perform a merge operation when you rebase to a baseline that contains the delivered version. DevOps Code ClearCase® merges all nonconflicting differences and will prompt you to decide how to resolve conflicting differences.
- Test your undelivered work after the rebase. After DevOps Code ClearCase reconfigures your work area and any conflicting merges have been resolved, you must verify that any undelivered work builds successfully in your work area using the most up-to-date elements of the new baseline. In the event of build errors, you will first need to resolve any conflicts before you can proceed to delivery your work.
- Complete the rebase operation. Only when you are satisfied with your test builds will you complete the rebase operation.