Rebasing files

Rebase individual files from a parent branch when you need to make sure the most recent changes from other users are available in a child branch. You can also rebase branches to retrieve all files with changes to a child branch. See Rebasing branches.

Rebasing only applies new changes to branches. It does not copy file contents between branches. The file version that was last rebased from is tracked on the Surround SCM Server. If a version in the parent branch was already rebased to the child branch, the file cannot be rebased until the version changes in the branch it was rebased from. It does not matter if the file contents are different. See No Files to Rebase in Surround SCM for information.

1. Select the files to rebase and choose Branch > Rebase Files.

The Rebase Files dialog box opens.

2. Enter any Comments, such as the reason for rebasing the files.

3. Select a Rebase files based on option.

• Latest version rebases the latest version of each file.
• Timestamp rebases changes from the specific timestamp.
• Label rebases changes from the selected label. Click Select to view label details or search for a label. See Selecting labels. Labels on files in the parent branch are not copied to the child branch.
• Latest version in state rebases changes from the latest version of each file in the selected workflow state.
• Snapshot rebases changes from the selected snapshot branch.

4. Select Skip server auto-merge to rebase all changes and overwrite any changes in the child branch.

5. Select Recursive to rebase the file to the selected repository and all subrepositories.

6. Click Preview.

The Rebase Preview dialog box opens. Files that will be rebased, files that will not be rebased, and files with conflicts are displayed. You can resolve conflicts based on the file status and your security permissions. See Rebase preview.

7. Select a file and click Rebase File to rebase it or click Rebase All to rebase all files. 

The Rebase Status dialog box opens. You can perform many of the same actions available in the Rebase Preview dialog box.

8. Click Close when you finish.