xinjian0101
4289f7f828
Publish the complete Continuity Director plugin with 14 functional nodes, a bilingual production dashboard, examples, tests, package metadata, help documentation, and CI. Remove obsolete encoded bootstrap artifacts and source-reconstruction automation.
8 lines
268 B
Markdown
8 lines
268 B
Markdown
# 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.
|