- Select the branch you want to rebase changes into. Choose Branch > Rebase Branch.
The Rebase Branch dialog box opens.
- The Branch and Parent branch fields are read-only.
- Enter optional comments about the reason for rebasing the branch.
- Select a Rebase Branch Based On option.
- Latest Version rebases from the latest version of each file.
- Timestamp rebases from a specific timestamp. This field must contain a valid timestamp.
- Label rebases from a specific label. This field must contain a valid label.
- Snapshot rebases from a snapshot branch. Choose the snapshot branch from the menu.
- Select Skip server auto-merge to rebase all files, overwriting any changes in the current branch.
- Optionally click Preview to view more information about the files being rebased.
For more information, see Rebase preview.
- Click OK to rebase the branch.
The Rebase Status dialog box opens. You can view files that were rebased or not rebased and files with conflicts. You can also access commands that help resolve conflicts and successfully rebase files.
- Select a file and click Differences to compare the file versions. See Diffing files for details.
- Select a file and click Merge Locally to manually merge the files. See Merging files for details.
- Select a file and click Force Rebase to rebase the file, overwriting any changes in the child branch. You are prompted to confirm the rebase. Click Yes.
Tip:
|
Click Save All to save the list of files or click Print to print the list of files.
|
- Click Close to close the Rebase Status dialog box.