Understanding Surround SCM Rebase Actions Seapine Software Knowledgebase

- Conferences
- Webinars

Search the Knowledgebase	Browse by Category
Advanced Search \| Home

Knowledgebase Home > Surround SCM

Understanding Surround SCM Rebase Actions

Last Updated
31st of July, 2008

Print this page

Email this page

Add to favorites

Export to PDF

Surround SCM allows you to rebase changes from the parent branch down to a selected child branch. You can preview the rebase actions to view more information about the files being rebased.

Following is a list of the rebase actions and corresponding reasons:

Action	Reason
Will rebase / Rebased	Modified file Modified file (renamed) Modified requiring merge Modified requiring merge (renamed) New file New repository Renamed Will remove/Removed
Will not rebase / Could not rebase	Share conflicts with removed file File checked out Binary files are different Unable to determine common ancestor for merge Invalid ancestor for merge Base file for share not found
User action required	Auto-merge conflict Auto-merge conflict (renamed) New file because target removed New repository because target removed Child share broken Parent share broken Broke parent share Broke child share
None	Security settings do not allow this action

Attachments

No attachments were found.