git-conflict-resolver

git-conflict-resolver JS library on GitHub git-conflict-resolver JS library on npm Download git-conflict-resolver JS library

A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

Version 1.3.7 License MPL-2.0
git-conflict-resolver has no homepage
git-conflict-resolver JS library on GitHub
git-conflict-resolver JS library on npm
Download git-conflict-resolver JS library
Keywords
jsonmergeconflictresolvergitdiffourstheirspackage.jsonbaseconfigturborepotoolingreact18-toolsmayank1513