Branch merge kept the live value

A branch merge found fields that both the live documents and the branch changed since the branch was forked. The live value was kept (the human's work is never overwritten) unless the merge asked to prefer the branch; every such field is in the merge report and the conflict log.

#Common causes

• Someone edited the same field live while the agent worked in its branch.

#Fixes

• Review the merge report and set the fields again if the branch's values should win, or merge with prefer: branch.

• Code: ARA2507

• Constant: collab::MERGE_KEPT_LIVE

• Reported by: ara-collab