UniversityOfSaskatchewanCMPT371 / term-project-2024-team-4

Apache License 2.0
2 stars 2 forks source link

Create a systematic approach when adding new dependencies on code repository #86

Closed keliboi closed 8 months ago

keliboi commented 8 months ago

A predefined steps for adding new dependencies can help avoid merge conflicts with the package-lock.json file

lecegues commented 8 months ago

Seems like a common issue in shared development. Here is one way to: https://gist.github.com/szemate/6fb69c8e3d8cce3efa9a6c922b337d98

lecegues commented 8 months ago

Currently, the easiest way I found is to:

  1. Fix package.json conflicts
  2. Delete node_modules
  3. npm install to regenerate the fixed package-lock.json
keliboi commented 8 months ago

These steps worked without having to manually check merge conflicts in the package-lock.json file, and is a viable solution for developers having merge conflicts when adding new dependencies.