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
110 stars 37 forks source link

package-lock.json has a merge conflict #30

Open josebagar opened 2 years ago

josebagar commented 2 years ago

e571ea01755b061aeb70d8b8c8e69e4e040b311a introduced a merge conflict in package-lock.json

Newer versions of npm will, apparently, ignore the file altogether in this case and re-resolve the dependencies, but older versions will just fail.