Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks for this great package!
I added a simple CLI command, you just run
merge-package.json
in your project directoryafter a merge failed with merge conflicts in
package.json
, and it writesthe merged output to
package.json
. It usesgit show HEAD:package.json
,git show MERGE_HEAD:package.json
, and alsogit show
with the output ofgit merge-base HEAD MERGE_HEAD
to get the input for your existing Node API.