Should a conflict occur, Ooyala FlexCM CLI will provide the you with a suggested course of Action. These are as follows:
- yes: Include this Object in the changeset anyway and ignore the conflict
- no: Skip this Object and don’t add it to the changeset
- include all: This means that all changes to all Objects will simply be committed, despite the conflict.
- skip all :Configuration Manager will not include any of the conflict items in the changeset.