error log：
your local changes would be overwritten by merge. commit stash or revert them to proceed. view them
You can't merge with local modifications. Git protects you from losing potentially important changes. You have three options. One is to commit the change using
git commit -m "My message"
The second is to stash it. stashing acts as a stack, where you can push changes, and you pop them in reverse order.
To stash type:
git stash
Do the merge, and than pull the stash:
git stash pop
The third options is to discard the local changes using git reset --hard.
http://stackoverflow.com/questions/15745045/how-do-i-resolve-git-saying-commit-your-changes-or-stash-them-before-you-can-me