Semantic merge conflict

A semantic three-way merge could not reconcile competing values, a deletion against an edit, or a newly invalid combined structure. The merge result retains $conflicts entries and usable records for resolution; ara merge writes that result but reports failure while conflicts remain.

#Common causes

• Both sides changed the same field differently.
• One side deleted a record or keyed item that the other changed.
• Individually valid changes combine into an invalid hierarchy or document structure.

#Fixes

• Use ara resolve <file> --pick <record>:<path>=ours, theirs or base for the reported conflict.

• Run ara check <file> after resolution, then ara fmt <file> to canonicalize and repair references.

• Code: ARA1701

• Constant: MERGE_CONFLICT

• Reported by: ara-merge