How to avoid merge errors
Hey!
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
Written by Mads Ulrik Svendsen
Related protips
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Terminal
Authors
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#