json-merge-resolver
Version:
A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.
2 lines (1 loc) • 381 B
JavaScript
import{a,b}from"./chunk-QPL3HXPB.mjs";import"./chunk-PRRU4E6A.mjs";import"./chunk-XH3FBGBA.mjs";import"./chunk-R7G6MN7W.mjs";import"./chunk-7UWGXGKY.mjs";import"./chunk-QY2IMCJG.mjs";import"./chunk-IOL4YJZP.mjs";import"./chunk-HB6Q755Y.mjs";import"./chunk-54J6PE6E.mjs";import"./chunk-3PFH3U2T.mjs";import"./chunk-76CZ6Z7T.mjs";export{a as processMerge,b as resolveGitMergeFiles};