7

* package-lock.json * merge conflict

ME: fuck fuck fuck, C-s I-Search: HEAD
ME: this shit is much i can't handle it, fuck

ME: rm package-lock.json ; npm install

Comments
  • 0
    1. Git checkout --ours package-lock.json
    2. Npm install the package again
Add Comment