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-2SJFRDGH.mjs";import"./chunk-WFDJ25NC.mjs";import"./chunk-Q4E7EFS7.mjs";import"./chunk-JD45QQDD.mjs";import"./chunk-ICS3PEIS.mjs";import"./chunk-NHG7C4LQ.mjs";import"./chunk-IOL4YJZP.mjs";import"./chunk-HB6Q755Y.mjs";import"./chunk-AUIVUOKV.mjs";import"./chunk-3PFH3U2T.mjs";import"./chunk-76CZ6Z7T.mjs";export{a as processMerge,b as resolveGitMergeFiles};