Disk edit conflicts with memory

A disk change conflicts with unsaved in-memory edits during three-way reconciliation. Neither version is overwritten. The host marks the document diverged and suspends automatic flushes for it until the conflict is resolved.

#Common causes

• The host and an external editor changed the same field differently, or made incompatible structural changes since the last synchronized version.

#Fixes

• Reconcile the external file so it can merge cleanly, then let the watcher process the corrected edit.

• To deliberately choose a whole version, call doc.sync with doc and keep: "memory" to overwrite disk, or keep: "disk" to replace loaded values from disk; inspect both versions before choosing.

• Code: ARA1908

• Constant: EXTERNAL_CONFLICT

• Reported by: ara-host