Hugo Dzin·Aug 14, 2023Resolving Git Conflicts in package-lock.jsonOften when doing Git merges in Node.js projects, we end up with conflicts in package-lock.json or yarn.lock. This usually happens if both…