Skip to content

Instantly share code, notes, and snippets.

@DimaRGB

DimaRGB/how to merge branches without changing package-lock.json

Created February 7, 2018 15:57
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save DimaRGB/5482e1e8bd3cc82d97511b65a2ae44a2 to your computer and use it in GitHub Desktop.
Save DimaRGB/5482e1e8bd3cc82d97511b65a2ae44a2 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
how to merge branches without changing package-lock.json
1. `git merge [base-branch]`
2. `rm package-lock.json` ( if you see conficts in this file )
3. `npm i`
4. `npm ddp`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment