How to Resolve Conflicts in Sandboxes

When you're in a sandbox, if other users publish their sandboxes, you get refresh notifications on the sandbox bar before the global header. At this time, it's a good practice to refresh your sandbox.

When you refresh, all changes published in the mainline environment are brought into your sandbox. You get sandbox merge conflicts in the merge log when different users change a specific file using different sandboxes. If the changes are made to different files, they're automatically merged, and aren't even reported in the merge log.

Note:

In Application Composer, an object gets automatically locked when you create it or modify it in a sandbox. So in such cases, an object can only be edited in any one sandbox at a time. If the sandbox is published or deleted, the lock is removed.

You must resolve all conflicts flagged in the merge log so that you can publish your sandbox. To review the merge log, on the Sandbox Detail: <Sandbox Name> page, click the Merge Log tab. The log displays details about the sandbox merge statuses. Let's understand what these statuses mean and how we can resolve the sandbox merge conflicts based on their statuses.

Merge Status	Icon	What It Means	How I Can Resolve Merge Conflicts
Automatically Merged Content	Auto Merge	Different users changed different attributes of the same file using different sandboxes.	These changes are merged automatically.
Resolvable Conflicts	Resolvable	Different users changed the same attribute of the same file using different sandboxes.	These changes can be merged to the mainline environment. On merging, the changes in the mainline environment overwrites your sandbox changes. So review the merge actions and accept or reject them. If you accept, you can later redo any changes that were overwritten and then publish your sandbox. If you reject, your sandbox remains untouched, but you still need to accept a merge before you publish your sandbox.
Unresolvable Conflicts	Unresolvable	Different users changed files in different sandboxes, but the merge conflicts can't be automatically resolved.	Do any of these tasks: Undo your sandbox changes. In your sandbox, make the same change, which the other user made in the published sandbox, and try to resolve the conflict. Create another sandbox and make your changes in that one.