Sparragus/gist:512b692f116cdda0689e1d1f48c91b41

Last active June 5, 2017 16:42

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/Sparragus/512b692f116cdda0689e1d1f48c91b41.js"></script>
Save Sparragus/512b692f116cdda0689e1d1f48c91b41 to your computer and use it in GitHub Desktop.

Download ZIP

Resolve `yarn.lock` merge conflicts

Raw

gistfile1.txt

	git checkout -- yarn.lock
	yarn install
	git add yarn.lock
	git rebase --continue

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment