The
Handle conflicts during import dialog box displays when:
- There are assets in the source and target that appear to be the same.
- You checked the
Intervene upon merge conflicts checkbox on the
Import window.
Review the conflicts in the list on the dialog box and select how you want the conflicts to be handled.
For users and groups, you will see:
- Use Source
- Selecting this option will override the values in the server configuration with the values in the backup file.
- Use Target
- Selecting this option will ignore the conflicting values in the backup file and use the values from the server configuration.
- Do the same for all remaining conflicts
- Selecting this saves whichever option you selected,
Use Source or
Use Target, and applies it to all merge conflicts.
For project name conflicts, you will see:
- Default action is to rename project using suffix (ConfigName.stbk).
- Select to let the application rename the project for you.
- Rename project using alternate suffix instead.
- Type in the name of the project in the field.