Rebasing branches

Rebasing merges changes from the parent branch down to the child branch. This ensures the child branch includes the most current files. For example, Cathy and Jon work on bug fixes in their workspaces. Jon completes his work and promotes changes to the parent branch. Cathy needs his changes to fix a bug. She rebases from the parent branch to merge Jon’s changes into her workspace.

  1. Select the branch you want to rebase changes into. Choose Branch > Rebase Branch.
  2. The Rebase Branch dialog box opens.

  3. The Branch and Parent branch fields are read-only.
  4. Enter optional comments about the reason for rebasing the branch.
  5. Select a Rebase Branch Based On option.
  6. Select Skip server auto-merge to rebase all files, overwriting any changes in the current branch.
  7. Optionally click Preview to view more information about the files being rebased.
  8. For more information, see Rebase preview.

  9. Click OK to rebase the branch.
  10. 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.

  11. Click Close to close the Rebase Status dialog box.