Skip to content

Instantly share code, notes, and snippets.

@EQuimper

EQuimper/gist:d74c986101b9d0598c80598cba034d90

Created November 21, 2018 16:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save EQuimper/d74c986101b9d0598c80598cba034d90 to your computer and use it in GitHub Desktop.
Save EQuimper/d74c986101b9d0598c80598cba034d90 to your computer and use it in GitHub Desktop.
Download ZIP
Fix yarn.lock error on merging
Raw
gistfile1.txt
git merge master
git checkout origin/master -- yarn.lock
git commit -m 'Fix conflicts'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment