修復未完成的git拉

Question

的Git拉遠程生產服務器上的過早停止，因爲錯誤的權限：

lucy@brambor src $ git pull 
... 
Updating 45e2051..80f6f43 
error: unable to create file src/templates/s/logo.eps (Permission denied) 

現在的權限應該是固定的，但回購壞了，我該怎麼辦？我是git的新手，現在至關重要的是不要犯錯誤，這就是我在這裏問的原因。

lucy@brambor src $ git status 
# On branch master 
# Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded. 
# 
# Changes not staged for commit: 
# (use "git add/rm <file>..." to update what will be committed) 
# (use "git checkout -- <file>..." to discard changes in working directory) 
# 
# modified: templates/base.html 
# deleted: templates/howto.html 

...

# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# templates/management.html 
# templates/recaptcha.html 

...

no changes added to commit (use "git add" and/or "git commit -a") 

Answer 1

只要你有固定的權限問題：

git clean -d 
git reset --hard 
git merge --ff-only origin/master