json-conflict-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) • 397 B
JavaScript
var o=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var s=Object.getOwnPropertyNames;var i=Object.prototype.hasOwnProperty;var u=(e,t,a,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of s(t))!i.call(e,r)&&r!==a&&o(e,r,{get:()=>t[r],enumerable:!(n=g(t,r))||n.enumerable});return e};var p=e=>u(o({},"__esModule",{value:!0}),e);var l={};module.exports=p(l);
;