git stash

git pull을 했을 시 아래와 같은 에러가 떴다.

error: Your local changes to the following files would be overwritten by merge:

        Makefile

Please, commit your changes or stash them before you can merge.

Aborting

git stash를 먼저 진행해주고 git pull을 하면 된다.

 

$ git stash

Saved working directory and index state WIP on master: dab9a8b [ferret] add cpuname procfile

HEAD is now at dab9a8b This is test commit