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

4 lines (3 loc) • 203 B
1
2
3
4
import { Config, InbuiltMergeStrategies } from "./types"; export * from "./types"; export declare const resolveConflicts: <T extends string = InbuiltMergeStrategies>(config: Config<T>) => Promise<void>;