[Source Tree]pull 시 오류 메세지

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

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

Aborting

Completed with errors, see above.

에러가 날 경우

rebase

http://git-scm.com/book/ko/Git-%EB%B8%8C%EB%9E%9C%EC%B9%98-Rebase%ED%95%98%EA%B8%B0

http://dogfeet.github.com/articles/2012/git-merge-rebase.html