A version conflict occurs when the main version of an asset has been updated by another project while you are in the process of working on a previous version. To avoid losing the changes from the other project, you must merge them into your version before you can deploy. This process is called conflict resolution.
To resolve a version conflict, you review the changes made to your project and then compare them to the changes made in the checked-in project. You can then choose whether to keep the original version, your version, or the checked-in version from the other project. After the conflict is resolved, the base version referenced by your project is updated with the latest checked-in version, and your working version is -updated with the values you chose when you resolved the conflict.
If there are conflicts between collection properties (lists, sets, maps, or arrays), Merchandising suggests an additional value that combines your changes with the changes from the other project. For more information, see Conflict Resolution for Collection Properties.
The following figure shows the conflict resolution process:
