Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add CLI command #28

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: add CLI command #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41881e5
feat: add CLI command
jedwards1211 Feb 5, 2019
438fce8
fix: use merge-package.json for CLI command name
jedwards1211 Feb 5, 2019
865aeee
test: add integration tests for CLI
jedwards1211 Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@ Merge package.json using local, base, and remote
* Follows SemVer
* Uses best guess to resolve conflicts

### CLI

```
npm install --global merge-package.json
```

Then just run `merge-package.json` in a directory with merge conflicts in
`package.json`. It will write the merged output back to `package.json`.

### Node API

```
npm install --save merge-package.json
```

```js
const mergePackageJson = require('merge-package.json');

Expand Down
Loading