npm

reshala

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

• reshala
• git
• package
• merge
• conflict
• resolve
• lerna

yungvldai

published 4.0.5 • 3 months agopublished 4.0.5 3 months ago

safe-merge-files

Merge two files like git

• without
• git
• merge
• conflict
• resolve
• files
• javascript

thekoushik

published 0.2.3 • 2 years agopublished 0.2.3 2 years ago

resolve-composer-conflict

Utility to automatically resolve composer.lock git conflicts

• composer
• lock
• git
• conflict
• merge
• resolve

namoscato

published 0.3.11 • 2 years agopublished 0.3.11 2 years ago