- Select the files you want to rebase.
- Choose Branch > Rebase Files.
The Rebase File(s) dialog box opens.
- The Branch, File(s), and Parent Branch fields are read-only.
- Enter optional comments about the reason for rebasing the branch.
- Select a Rebase File(s) Based On option.
- Latest Revision rebases the latest revision of each file.
- Timestamp rebases changes from a specific timestamp. This field must contain a valid timestamp before the rebase operation can start.
- Label rebases changes from a specific label. This field must contain a valid label before the rebase operation can start.
- Snapshot rebases changes from a snapshot branch. Choose the snapshot branch from the menu.
- Select Skip server auto-merge to forcibly rebase all changes and overwrite any changes in the child branch.
- Click Preview to view more information about the files being rebased.
For more information see Rebase preview.
- Click OK to rebase changes.
The Rebase Status dialog box opens.
- You can view files that were rebased, files that were not rebased, and files with conflicts. You can access commands to resolve file conflicts and successfully rebase files.
- Select a file and click Differences to compare file versions. For more information see Diffing files.
- Select a file and click History to view file history. For more information see Viewing file history.
- Select a file and click Merge Locally to manually merge files. For more information see Merging files.
- Select a file and click Force Rebase to rebase the file and overwrite any changes in the child branch. You are prompted to confirm the rebase. Click Yes.
- Click Close to close the Rebase Status dialog box.