Files
xinjian0101-continuity-dire…/js/docs/CDThreeWayMerge.md

268 B

Three-Way Merge / 三方合并

Merges base, current, and incoming JSON while reporting exact conflict paths.

合并基础、当前和传入 JSON,并报告精确冲突路径。

On conflict, the current value is preserved and the conflict is returned separately.