Rebasing files

You can rebase files to make sure you have the most recent copy of the files, including changes made by other users. For detailed information about rebasing, see Rebasing branches.

  1. Select the files you want to rebase.
  2. Choose Branch > Rebase Files.
  3. The Rebase File(s) dialog box opens.

  4. The Branch, File(s), and Parent Branch fields are read-only.
  5. Enter optional comments about the reason for rebasing the branch.
  6. Select a Rebase File(s) Based On option.
  7. Select Skip server auto-merge to forcibly rebase all changes and overwrite any changes in the child branch.
  8. Click Preview to view more information about the files being rebased.
  9. For more information see Rebase preview.

  10. Click OK to rebase changes.
  11. The Rebase Status dialog box opens.

  12. 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.
  13. Click Close to close the Rebase Status dialog box.