Geek asks and answers

Git stash cannot update, how to put only some files

I have hidden my changes to do the git trick, but now I can not pull the changes from my wallet. It looks like this:

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(-)

Can someone explain in simple words how I can cancel a file in a conflict (accept a copy of it) when restoring my changes to files that have no conflicts.

+5
source share
1 answer

Below links.

A message simply means that you have outstanding changes. You also get this, for example. if you stagechange with git add, then change your mind and make a git reset HEADfile with the intention of starting.

0
source

More articles:


All Articles