❤
npm
Sign UpSign In

merge-conflicts

0.0.7 • Public • Published

merge-conflicts

Just a quick hack to be able to check the mergability of two branches ...

$ npx merge-conflicts origin/feature/whatever origin/stable
CONFLICT   base   100644 77cfa58d94e8e06a2d2500468fff6f86ea820876 composer.json
CONFLICT   base   100644 640c614c8fcf697086c0e7ed3775a32da1758ada composer.lock

Dependencies (0)

    Dev Dependencies (0)

      Package Sidebar

      Install

      npm i merge-conflicts

      Repository

      github.com/janole/merge-conflicts

      Homepage

      github.com/janole/merge-conflicts#readme

      Weekly Downloads

      3

      Version

      0.0.7

      License

      MIT

      Unpacked Size

      3.35 kB

      Total Files

      5

      Last publish

      Collaborators

      • janole
      Try on RunKit
      Report malware