Git如何強制拉取一個遠程分支到本地分支（轉載）

有時候，咱們在使用git pull指令想把一個遠程分支拉取到本地分支的時候，總是會拉取失敗，這通常是由於某種緣由，本地分支和遠程分支的內容差別沒法被git成功識別出來，因此git pull指令什麼都不會拉取下來或拉取失敗。下面這個帖子的方法能夠解決這個問題，強制拉取一個遠程分支的全部內容來覆蓋本地分支。

 

問：

---

The scenario is following:

• A team member is modifying the templates for a website we are working on
• They are adding some images to the images directory (but forgets to add them under source control)
• They are sending the images by mail, later, to me
• I'm adding the images under the source control and pushing them to GitHub together with other changes
• They cannot pull updates from GitHub because Git doesn't want to overwrite their files.

This is the error I'm getting:

error: Untracked working tree file 'public/images/icon.gif' would be overwritten by merge

How do I force Git to overwrite them? The person is a designer - usually I resolve all the conflicts by hand, so the server has the most recent version that they just needs to update on their computer.

 

 

答：

---

Try this:

git reset --hard HEAD
git pull

It should do what you want.

 

 

原文連接