Cacher is the code snippet organizer for pro developers

// There is a simple solution based on Git stash. Stash everything that you've changed, 
// pull all the new stuff, apply your stash. 

git stash
git pull
git stash pop