Files
xinjian0101-continuity-dire…/js/docs/CDThreeWayMerge.md
xinjian0101 4289f7f828 feat: upload complete v0.8.0 ComfyUI plugin and redesign dashboard
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.
2026-06-19 15:01:57 +08:00

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.