git stash 无法刷新，如何只 pop 一些文件

Question

我已经 stash 了我的更改以便进行 git pull，但现在我无法从我的存储中 pop 更改。它看起来像这样:

dave@apollo % git stash pop 
sites/all/themes/foobar122/node--pin.tpl.php: needs merge
unable to refresh index

dave@apollo % git stash show  
 .htaccess                                            | 10 +++++-----
 phpinfo.php                                          |  4 +++-
 sites/all/modules/ajax_comments/ajax_comments.module |  6 +++---
 sites/all/themes/foobar122/node--pin.tpl.php         | 14 +++++++-------
 4 files changed, 18 insertions(+), 16 deletions(-)

有人可以用简单的术语解释我如何在恢复对没有冲突的文件的更改的同时恢复冲突的文件(接受他们的副本)。

Answer 1

从下面的链接。

The message simply means that you have outstanding changes. You also get this e.g. if you stage some changes with git add, then change your mind and do git reset HEAD file with the intention of starting over.

what-does-it-mean-when-git-says-a-file-needs-update

needs_update