UNPKG

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.

github.com/react18-tools/git-json-resolver/

react18-tools/git-json-resolver

3 lines (2 loc) • 169 B
1
2
3
/** Build conflict markers into serialized string */ export declare const reconstructConflict: (merged: any, ours: any, theirs: any, format: string) => Promise<string>;