Last Updated: February 25, 2016
· madsulrik_

How to avoid merge errors


If you need to pull down a project, when you are not finished with something. Then use git stash

git stash
git pull

now you have the newest version of the project then you can pop your stuff in again

git stash pop