Should a conflict occur, Configuration Manager CLI will provide the you with a suggested courses 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.