Surround SCM allows you to promote changes from a child branch to a parent or ancestor branch. You can preview the promote actions to view more information about the files being promoted.
Following is a list of the promote actions and corresponding reasons:
Action
Reason
Will promote / Promoted
Modified file Modified file (renamed) Modified requiring merge Modified requiring merge (renamed) New file New repository New file because target removed New repository because target removed Renamed Will remove/Removed
Will not promote / Could not promote
Share conflicts with removed file File checked out Binary files are different Binary files are different (renamed) Unable to determine common ancestor for merge
User action required
Auto-merge conflict Auto-merge conflict (renamed) File checked out Will not remove/Did not remove Will not remove (renamed)/Did not remove (renamed) Child share broken Parent share broken Broke parent share Broke child share
None
Security settings do not allow this action New file because target removed New repository because target removed