Hi Folks today when i was working on a project , wanted to install NPM in my project, but encountered this errors saying .
npm ERR! conflict Automatic conflict resolution failed. Please manually resolve conflicts in package-lock.json and try again npm ERR! A complete log of this run can be found in: npm ERR! C:\Users\user\AppData\Roaming\npm-cache\_logs\2019-06-10T15_01_39_991Z-debug.log PS C:\xampp\htdocs\oer_coalcity\ccu-oer> npm install --package-lock npm WARN conflict A git conflict was detected in package-lock.json. Attempting to auto-resolve.
How I solved It
1. Run rm package-lock.json
2. Run npm install
3. Run git add package-lock.json
Thats how i got my npm installed in my project.