0.0.7 • Published 4 years ago

merge-conflicts v0.0.7

Weekly downloads
10
License
MIT
Repository
github
Last release
4 years ago

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
gitmergeconflictconflictscicdci-cd
@infinitebrahmanuniverse/nolb-mer@everything-registry/sub-chunk-2156
0.0.7

4 years ago

0.0.6

5 years ago

0.0.5

5 years ago

0.0.4

5 years ago

0.0.3

5 years ago

0.0.2

5 years ago

0.0.1

5 years ago