Description
In certain situations, the Save & Merge button may not be available on the Resolve Conflicts page.
Release or Environment
All releases
Cause
Working as intended.
Resolution
The Save & Merge button showing up depends on whether or not the associated table is on the "merge record blacklist" or not. The following tables are on the blacklist:
- sys_ui_list
- sys_ui_section
- sys_ui_form
- sys_ui_form_section
- sys_ui_related_list
- sys_choice
- sys_choice_set
- wf_workflow
- wf_workflow_version
This behavior is by design and cannot be modified. If you are resolving conflicts on the aforementioned tables, the Save & Merge button will not be shown. This is due to the fact that records from these tables have payloads which contain multiple records in one file, and this format is not supported when merging.