Rebase preview
You can view file status, files that will or will not be rebased, and files with conflicts. The actions you can perform depend on the file status and your security permissions.
1. Click Preview on the Rebase Branch or Rebase Files dialog box.
The Rebase Preview dialog box opens.
2. Select a file and click a button to perform an action.
Button | Action | More Information |
---|---|---|
Differences | Compare the branch file versions. | Viewing file differences |
History | View the file history. | Viewing file history |
Properties | View the file properties. | Viewing file properties |
Attach | Attach the file to an item in Helix ALM or an external issue tracking tool. You can only attach files that were already successfully rebased and changed the version number on the destination branch. Files removed, renamed, or in broken shares cannot be attached. | Attaching source files to Helix ALM items and Attaching source files to external issues |
Add to Code Review | Add the file to a code review. | Adding files to code reviews |
Rebase File | Rebase the file. | Rebasing files |
Merge Locally | Manually merge the files. | Merging files |
Break Share | Unshare the files. | Breaking shares |
Force Rebase | Rebase the file and overwrite the child branch file. |
3. Select Label rebased files in destination to label files in the parent branch. Select a label or select <New label> to create a new label. See Creating labels. Click Select to view label details or search for a label. See Selecting labels.
Labels are only added to files that are successfully rebased or merged locally. Files removed, renamed, or in broken shares are not labeled. Any rebase comments you entered are also added to the label history.
4. Click Rebase All to rebase all files.
The Rebase Status dialog box opens. You can view files that were or were not rebased and files with conflicts. See Rebase actions. You can also access actions to resolve file conflicts.
5. Click Save As to save the results list or click Print to print it.
6. Click Close when you finish.