{"_id":"parse-conflict-json","_rev":"4130646","name":"parse-conflict-json","description":"Parse a JSON string that has git merge conflicts, resolving if possible","dist-tags":{"latest":"5.0.1"},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"time":{"modified":"2026-03-01T18:32:35.000Z","created":"2019-08-07T20:00:58.821Z","5.0.1":"2025-10-23T18:01:02.707Z","5.0.0":"2025-10-22T20:33:05.840Z","4.0.0":"2024-09-25T17:20:47.906Z","3.0.1":"2023-03-21T18:51:28.067Z","3.0.0":"2022-10-14T05:22:52.351Z","2.0.2":"2022-03-28T20:40:39.860Z","2.0.1":"2021-12-08T21:04:19.919Z","2.0.0":"2021-12-08T20:57:17.269Z","1.1.1":"2020-08-20T21:28:58.814Z","1.1.0":"2020-07-14T00:37:10.800Z","1.0.1":"2019-08-09T05:59:01.957Z","1.0.0":"2019-08-07T20:00:58.821Z"},"users":{},"author":{"name":"GitHub Inc."},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"versions":{"5.0.1":{"name":"parse-conflict-json","version":"5.0.1","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","lint":"npm run eslint","postlint":"template-oss-check","lintfix":"npm run eslint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force","eslint":"eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""},"tap":{"check-coverage":true,"nyc-arg":["--exclude","tap-snapshots/**"]},"devDependencies":{"@npmcli/eslint-config":"^5.0.0","@npmcli/template-oss":"4.27.1","tap":"^16.0.1"},"dependencies":{"json-parse-even-better-errors":"^5.0.0","just-diff":"^6.0.0","just-diff-apply":"^5.2.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"engines":{"node":"^20.17.0 || >=22.9.0"},"templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.27.1","publish":true},"gitHead":"51594349f8b8eecf0ed5bae930702732599888c6","_id":"parse-conflict-json@5.0.1","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_nodeVersion":"22.20.0","_npmVersion":"11.6.2","dist":{"shasum":"db4acd7472fb400c9808eb86611c2ff72f4c84ba","size":2973,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-5.0.1.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-5.0.1.tgz"},"_npmUser":{"name":"GitHub Actions","email":"npm-oidc-no-reply@github.com","trustedPublisher":{"id":"github","oidcConfigId":"oidc:f3a99145-2de3-4deb-941e-3b7d9a796a42"}},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages-npm-production","tmp":"tmp/parse-conflict-json_5.0.1_1761242462467_0.057304237570827476"},"_hasShrinkwrap":false,"_cnpmcore_publish_time":"2025-10-23T18:01:02.707Z","publish_time":1761242462707,"_source_registry_name":"default","_cnpm_publish_time":1761242462707},"5.0.0":{"name":"parse-conflict-json","version":"5.0.0","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","lint":"npm run eslint","postlint":"template-oss-check","lintfix":"npm run eslint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force","eslint":"eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""},"tap":{"check-coverage":true,"nyc-arg":["--exclude","tap-snapshots/**"]},"devDependencies":{"@npmcli/eslint-config":"^5.0.0","@npmcli/template-oss":"4.27.1","tap":"^16.0.1"},"dependencies":{"json-parse-even-better-errors":"^4.0.0","just-diff":"^6.0.0","just-diff-apply":"^5.2.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"engines":{"node":"^20.17.0 || >=22.9.0"},"templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.27.1","publish":true},"gitHead":"3cae62c8bbc9094d9a3d51bc169dcb91ab457a0f","_id":"parse-conflict-json@5.0.0","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_nodeVersion":"22.20.0","_npmVersion":"11.6.2","dist":{"shasum":"0ad1345fbae0f0a162744f8b17e2a07952197390","size":2976,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-5.0.0.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-5.0.0.tgz"},"_npmUser":{"name":"GitHub Actions","email":"npm-oidc-no-reply@github.com","trustedPublisher":{"id":"github","oidcConfigId":"oidc:f3a99145-2de3-4deb-941e-3b7d9a796a42"}},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages-npm-production","tmp":"tmp/parse-conflict-json_5.0.0_1761165185575_0.32971324693239"},"_hasShrinkwrap":false,"_cnpmcore_publish_time":"2025-10-22T20:33:05.840Z","publish_time":1761165185840,"_source_registry_name":"default","_cnpm_publish_time":1761165185840},"4.0.0":{"name":"parse-conflict-json","version":"4.0.0","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","lint":"npm run eslint","postlint":"template-oss-check","lintfix":"npm run eslint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force","eslint":"eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""},"tap":{"check-coverage":true,"nyc-arg":["--exclude","tap-snapshots/**"]},"devDependencies":{"@npmcli/eslint-config":"^5.0.0","@npmcli/template-oss":"4.23.3","tap":"^16.0.1"},"dependencies":{"json-parse-even-better-errors":"^4.0.0","just-diff":"^6.0.0","just-diff-apply":"^5.2.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"engines":{"node":"^18.17.0 || >=20.5.0"},"templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.23.3","publish":true},"_id":"parse-conflict-json@4.0.0","gitHead":"d0655a9ec0a9e640ae00611c0b62ddc0a513a138","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_nodeVersion":"22.9.0","_npmVersion":"10.8.3","dist":{"shasum":"996b1edfc0c727583b56c7644dbb3258fc9e9e4b","size":2974,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-4.0.0.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-4.0.0.tgz"},"_npmUser":{"name":"npm-cli-ops","email":"npm-cli+bot@github.com"},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_4.0.0_1727284847711_0.362585997362203"},"_hasShrinkwrap":false,"_cnpmcore_publish_time":"2024-09-25T17:20:47.906Z","publish_time":1727284847906,"_source_registry_name":"default","_cnpm_publish_time":1727284847906},"3.0.1":{"name":"parse-conflict-json","version":"3.0.1","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","lint":"eslint \"**/*.js\"","postlint":"template-oss-check","lintfix":"npm run lint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force"},"tap":{"check-coverage":true,"nyc-arg":["--exclude","tap-snapshots/**"]},"devDependencies":{"@npmcli/eslint-config":"^4.0.0","@npmcli/template-oss":"4.12.0","tap":"^16.0.1"},"dependencies":{"json-parse-even-better-errors":"^3.0.0","just-diff":"^6.0.0","just-diff-apply":"^5.2.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"engines":{"node":"^14.17.0 || ^16.13.0 || >=18.0.0"},"templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.12.0"},"bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@3.0.1","_nodeVersion":"18.13.0","_npmVersion":"9.6.1","dist":{"shasum":"67dc55312781e62aa2ddb91452c7606d1969960c","size":2931,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-3.0.1.tgz"},"_npmUser":{"name":"gar","email":"gar+npm@danger.computer"},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_3.0.1_1679424687909_0.3349093562856711"},"_hasShrinkwrap":false,"_cnpmcore_publish_time":"2023-03-21T18:51:28.067Z","publish_time":1679424688067,"_cnpm_publish_time":1679424688067},"3.0.0":{"name":"parse-conflict-json","version":"3.0.0","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","lint":"eslint \"**/*.js\"","postlint":"template-oss-check","lintfix":"npm run lint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force"},"tap":{"check-coverage":true,"nyc-arg":["--exclude","tap-snapshots/**"]},"devDependencies":{"@npmcli/eslint-config":"^3.0.1","@npmcli/template-oss":"4.5.1","tap":"^16.0.1"},"dependencies":{"json-parse-even-better-errors":"^3.0.0","just-diff":"^5.0.1","just-diff-apply":"^5.2.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"engines":{"node":"^14.17.0 || ^16.13.0 || >=18.0.0"},"templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.5.1"},"gitHead":"708bbe1e24371c2dfa55aff950707bbb8afdc9f9","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@3.0.0","_nodeVersion":"18.10.0","_npmVersion":"8.19.2","dist":{"shasum":"eb266cbeeb66e73c3e92806da4d4ace3b798acff","size":2926,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-3.0.0.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-3.0.0.tgz"},"_npmUser":{"name":"lukekarrys","email":"luke@lukekarrys.com"},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_3.0.0_1665724972145_0.41215624601516176"},"_hasShrinkwrap":false,"_cnpmcore_publish_time":"2022-10-19T21:41:45.200Z","publish_time":1665724972351,"_cnpm_publish_time":1665724972351},"2.0.2":{"name":"parse-conflict-json","version":"2.0.2","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags","lint":"eslint \"**/*.js\"","postlint":"template-oss-check","lintfix":"npm run lint -- --fix","prepublishOnly":"git push origin --follow-tags","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force"},"tap":{"check-coverage":true},"devDependencies":{"@npmcli/eslint-config":"^3.0.1","@npmcli/template-oss":"3.2.0","tap":"^16.0.1"},"dependencies":{"json-parse-even-better-errors":"^2.3.1","just-diff":"^5.0.1","just-diff-apply":"^5.2.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"engines":{"node":"^12.13.0 || ^14.15.0 || >=16.0.0"},"templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"3.2.0"},"gitHead":"31f1f327a2a0ae44711df2460262335ebc988754","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@2.0.2","_nodeVersion":"16.14.2","_npmVersion":"8.5.0","dist":{"shasum":"3d05bc8ffe07d39600dc6436c6aefe382033d323","size":2950,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-2.0.2.tgz"},"_npmUser":{"name":"gar","email":"gar+npm@danger.computer"},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_2.0.2_1648500039512_0.34998767890286997"},"_hasShrinkwrap":false,"_cnpmcore_publish_time":"2022-03-28T20:40:43.267Z","publish_time":1648500039860,"_cnpm_publish_time":1648500039860},"2.0.1":{"name":"parse-conflict-json","version":"2.0.1","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags","lint":"eslint '**/*.js'","postlint":"npm-template-check","lintfix":"npm run lint -- --fix","prepublishOnly":"git push origin --follow-tags","posttest":"npm run lint"},"tap":{"check-coverage":true},"devDependencies":{"@npmcli/template-oss":"^2.3.1","tap":"^15.1.5"},"dependencies":{"json-parse-even-better-errors":"^2.3.1","just-diff":"^5.0.1","just-diff-apply":"^4.0.1"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"templateVersion":"2.3.1","engines":{"node":"^12.13.0 || ^14.15.0 || >=16"},"gitHead":"3818d0e7996e493c97e2d9f1b1d36d9f2d7053bf","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@2.0.1","_nodeVersion":"16.13.0","_npmVersion":"8.2.0","dist":{"shasum":"76647dd072e6068bcaff20be6ccea68a18e1fb58","size":2879,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-2.0.1.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-2.0.1.tgz"},"_npmUser":{"name":"gar","email":"gar+npm@danger.computer"},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_2.0.1_1638997459503_0.9041228806333315"},"_hasShrinkwrap":false,"publish_time":1638997459919,"_cnpm_publish_time":1638997459919},"2.0.0":{"name":"parse-conflict-json","version":"2.0.0","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"GitHub Inc."},"license":"ISC","main":"lib","scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags","lint":"eslint '**/*.js'","postlint":"npm-template-check","lintfix":"npm run lint -- --fix","prepublishOnly":"git push origin --follow-tags","posttest":"npm run lint"},"tap":{"check-coverage":true},"devDependencies":{"tap":"^15.1.5"},"dependencies":{"@npmcli/template-oss":"^2.3.1","json-parse-even-better-errors":"^2.3.1","just-diff":"^5.0.1","just-diff-apply":"^4.0.1"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"templateVersion":"2.3.1","engines":{"node":"^12.13.0 || ^14.15.0 || >=16"},"gitHead":"a1483d85b12f2e5a90356a3d42db285f443ef909","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@2.0.0","_nodeVersion":"16.13.0","_npmVersion":"8.2.0","dist":{"shasum":"bc38debd49609614723980547a3866ad4f1e45a3","size":2880,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-2.0.0.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-2.0.0.tgz"},"_npmUser":{"name":"gar","email":"gar+npm@danger.computer"},"directories":{},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_2.0.0_1638997037116_0.9554681862104208"},"_hasShrinkwrap":false,"publish_time":1638997037269,"_cnpm_publish_time":1638997037269},"1.1.1":{"name":"parse-conflict-json","version":"1.1.1","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"Isaac Z. Schlueter","email":"i@izs.me","url":"https://izs.me"},"license":"ISC","scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags"},"tap":{"check-coverage":true},"devDependencies":{"tap":"^14.6.1"},"dependencies":{"just-diff":"^3.0.1","just-diff-apply":"^3.0.0","json-parse-even-better-errors":"^2.3.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"gitHead":"0d3265f821c67ec475b85aac6cff359eaea8bf78","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@1.1.1","_nodeVersion":"14.8.0","_npmVersion":"7.0.0-beta.5","dist":{"shasum":"54ec175bde0f2d70abf6be79e0e042290b86701b","size":2667,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-1.1.1.tgz"},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmUser":{"name":"isaacs","email":"i@izs.me"},"directories":{},"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_1.1.1_1597958938711_0.9859568921054687"},"_hasShrinkwrap":false,"publish_time":1597958938814,"_cnpm_publish_time":1597958938814},"1.1.0":{"name":"parse-conflict-json","version":"1.1.0","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"Isaac Z. Schlueter","email":"i@izs.me","url":"https://izs.me"},"license":"ISC","scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags"},"tap":{"check-coverage":true},"devDependencies":{"tap":"^14.6.1"},"dependencies":{"json-parse-better-errors":"^1.0.2","just-diff":"^3.0.1","just-diff-apply":"^3.0.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"gitHead":"d9d0a02bb140445bae53b5a395cda2e551200b90","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@1.1.0","_nodeVersion":"14.2.0","_npmVersion":"6.14.5","dist":{"shasum":"93d7c5e86badffbd7249411250737e5a175b1294","size":2661,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-1.1.0.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-1.1.0.tgz"},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmUser":{"name":"isaacs","email":"i@izs.me"},"directories":{},"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_1.1.0_1594687030640_0.5935731346955817"},"_hasShrinkwrap":false,"publish_time":1594687030800,"_cnpm_publish_time":1594687030800},"1.0.1":{"name":"parse-conflict-json","version":"1.0.1","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"Isaac Z. Schlueter","email":"i@izs.me","url":"https://izs.me"},"license":"ISC","scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags"},"tap":{"check-coverage":true},"devDependencies":{"tap":"^14.6.1"},"dependencies":{"json-parse-better-errors":"^1.0.2","just-diff":"^3.0.1","just-diff-apply":"^3.0.0"},"repository":{"type":"git","url":"git+https://github.com/npm/parse-conflict-json.git"},"gitHead":"4ef9e12063132499a7e08529c2ee709452465782","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"homepage":"https://github.com/npm/parse-conflict-json#readme","_id":"parse-conflict-json@1.0.1","_nodeVersion":"12.6.0","_npmVersion":"6.10.3","dist":{"shasum":"780b559bda5d6fd64846291dde9a38704a2132d2","size":2605,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-1.0.1.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-1.0.1.tgz"},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmUser":{"name":"isaacs","email":"i@izs.me"},"directories":{},"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_1.0.1_1565330341839_0.2392140954416646"},"_hasShrinkwrap":false,"publish_time":1565330341957,"_cnpm_publish_time":1565330341957},"1.0.0":{"name":"parse-conflict-json","version":"1.0.0","description":"Parse a JSON string that has git merge conflicts, resolving if possible","author":{"name":"Isaac Z. Schlueter","email":"i@izs.me","url":"https://izs.me"},"license":"ISC","scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags"},"tap":{"check-coverage":true},"devDependencies":{"tap":"^14.6.1"},"dependencies":{"json-parse-better-errors":"^1.0.2","just-diff":"^3.0.1","just-diff-apply":"^3.0.0"},"gitHead":"5befd03f167d1bbbda89fc607e8b2730c5a94d74","_id":"parse-conflict-json@1.0.0","_nodeVersion":"12.6.0","_npmVersion":"6.10.3","dist":{"shasum":"725e232cf756d4940271aeb39f6554ccc4a6f489","size":31622,"noattachment":false,"key":"/parse-conflict-json/-/parse-conflict-json-1.0.0.tgz","tarball":"http://registry.cnpm.dingdandao.com/parse-conflict-json/download/parse-conflict-json-1.0.0.tgz"},"maintainers":[{"name":"gar","email":""},{"name":"npm-cli-ops","email":""},{"name":"owlstronaut","email":""},{"name":"reggi","email":""},{"name":"saquibkhan","email":""}],"_npmUser":{"name":"isaacs","email":"i@izs.me"},"directories":{},"_npmOperationalInternal":{"host":"s3://npm-registry-packages","tmp":"tmp/parse-conflict-json_1.0.0_1565208058692_0.005336259628950346"},"_hasShrinkwrap":false,"publish_time":1565208058821,"_cnpm_publish_time":1565208058821}},"readme":"# parse-conflict-json\n\nParse a JSON string that has git merge conflicts, resolving if possible.\n\nIf the JSON is valid, it just does `JSON.parse` as normal.\n\nIf either side of the conflict is invalid JSON, then an error is thrown for\nthat.\n\n## USAGE\n\n```js\n// after a git merge that left some conflicts there\nconst data = fs.readFileSync('package-lock.json', 'utf8')\n\n// reviverFunction is passed to JSON.parse as the reviver function\n// preference defaults to 'ours', set to 'theirs' to prefer the other\n// side's changes.\nconst parsed = parseConflictJson(data, reviverFunction, preference)\n\n// returns true if the data looks like a conflicted diff file\nparsed.isDiff(data)\n```\n\n## Algorithm\n\nIf `prefer` is set to `theirs`, then the vaules of `theirs` and `ours` are\nswitched in the resolver function.  (Ie, we'll apply their changes on top\nof our object, rather than the other way around.)\n\n- Parse the conflicted file into 3 pieces: `ours`, `theirs`, and `parent`\n\n- Get the [diff](https://github.com/angus-c/just#just-diff) from `parent`\n  to `ours`.\n\n- [Apply](https://github.com/angus-c/just#just-diff-apply) each change of\n  that diff to `theirs`.\n\n    If any change in the diff set cannot be applied (ie, because they\n    changed an object into a non-object and we changed a field on that\n    object), then replace the object at the specified path with the object\n    at the path in `ours`.\n","_attachments":{},"homepage":"https://github.com/npm/parse-conflict-json#readme","bugs":{"url":"https://github.com/npm/parse-conflict-json/issues"},"license":"ISC"}