reshala

A simple CLI tool to resolve package.json merge conflicts.

v4.0.5 URL: https://unpkg.com/reshala@4.0.5/index.js

Open Browse Files

reshala git package merge conflict resolve lerna

resolve-composer-conflict

Utility to automatically resolve composer.lock git conflicts

v0.3.11 URL: https://unpkg.com/resolve-composer-conflict@0.3.11/index.js

Open Browse Files

composer lock git conflict merge resolve

safe-merge-files

Merge two files like git

v0.2.3 URL: https://unpkg.com/safe-merge-files@0.2.3/index.js

Open Browse Files

without git merge conflict resolve files javascript