git pull origin master 时候提示: Untracked working tree file '.gitignore' would be overwritten by merge

 git reset --hard FETCH_HEAD
# reset 命令后重新尝试 git pull

git push 的时候报错:git error: failed to push some refs to

@see https://stackoverflow.com/questions/24114676/git-error-failed-to-push-some-refs-to
git pull --rebase origin master
git push origin master