Chaosplay

Pulling changes from GIT repo without overwriting your changes, use stash command

In his case he needed to run:

git stash work

git pull

git apply work

via Git trick « Piku’s Blog.