search

aws-samples / aws-cross-account-cicd-pipeline

Example of how to use CDK to create a CodePipeline CI/CD pipeline, and how to configure it to deploy resources on different AWS Accounts.
MIT No Attribution
111 stars 37 forks source link

npm install command failing #28

Closed arnabaws15 closed 1 year ago

arnabaws15 commented 1 year ago

When running npm install I get the following error:

npm WARN conflict A git conflict was detected in package-lock.json. Attempting to auto-resolve.
npm WARN conflict To make this happen automatically on git rebase/merge, consider using the npm-merge-driver:
npm WARN conflict $ npx npm-merge-driver install -g
npm ERR! conflict Automatic conflict resolution failed. Please manually resolve conflicts in package-lock.json and try again.
npm ERR! Unexpected token < in JSON at position 119 while parsing near '...kages": {
npm ERR!     "": {
npm ERR! <<<<<<< HEAD
npm ERR!       "...'

Here are the versions in my environment: npm: 6.14.7 cdk: 2.50.0 tsc: 4.8.4

arnabaws15 commented 1 year ago

Delete the package-lock.json and it will build.