Geek Answers Handbook

How to pull for all files except one?

I want to pull changes except one file ( GNUmakefilebelow). I looked through the man pages git-pull(3), but this option does not suit me.

How do I make all the changes, but skip the file causing the git problem? Is there an option to "ignore files with conflicts" or "ignore file X" or similar?

(The worst thing is that it GNUmakefilewas copied / pasted between virtual machines, so they are almost of the same file. cryptopp-rwMakefile has several dependency recipes added at the end of it).

cryptopp-rw$ git pull
remote: Counting objects: 7, done.
remote: Total 7 (delta 4), reused 4 (delta 4), pack-reused 3
Unpacking objects: 100% (7/7), done.
From https://github.com/weidai11/cryptopp
   4206b4a..cf08f3e  master     -> origin/master
Updating 4206b4a..cf08f3e
error: Your local changes to the following files would be overwritten by merge:
    GNUmakefile
Please, commit your changes or stash them before you can merge.
Aborting
+4
source share
2 answers

, pull, git, . :

git stash pop stash@{<revision>}

, , , , , git:

git checkout HEAD^ file/to/overwrite
git pull

-f:

git pull -f
+2

, git update-index --skip-worktree git pull , , :

  • 'gpu', script
  • script, , git pull, ( , stash pop)
+1

More articles:


All Articles