Unable do Git Pull

Question

I'm trying to git pull origin master but I'm having a problem with a local files. This local file already is in my gitignore but i'm still having this error:

error: Your local changes to the following files would be overwritten by merge

I tried:

git pull origin master --force
How do I force "git pull" to overwrite local files?

The second attemps returned:

error: Entry 'myfolder/myfile' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'origin/master'.

My output from git status:

On branch master
Your branch is behind 'origin/master' by 119 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

nothing to commit, working tree clean

It might help to add the output from `git status`, since no-one but you has any idea what the current state of your repo is. — Useless, Jan 18 '19 at 13:12
It doesn't matter that your local file is in .gitignore. You need to remove it from your working copy. — yole, Jan 18 '19 at 13:13
Possible duplicate of [How do I force "git pull" to overwrite local files?](https://stackoverflow.com/questions/1125968/how-do-i-force-git-pull-to-overwrite-local-files) — Sagar P. Ghagare, Jan 18 '19 at 19:15
If you can can you please check for merge conflict markers in the file that gave an error? — randomuser5215, Jan 30 '19 at 11:40

score 0 · Answer 1 · answered Jan 18 '19 at 14:42

0

I was able to pull by deleting my file that was causing the problem but that's really not the best solution.

answered Jan 18 '19 at 14:42

PedroSG

466
2
9
38

score 0 · Answer 2 · answered Jan 18 '19 at 19:06

for the future, the problem was caused by that local file being changed, you can use git stash in order to temporarily store the changes and use git pull to get the remote version, then use git stash pop to return the local file to the changes you had.

in terms of the file being in the git ignore, you would need to run git rm --cached for the changes to be ignored if you added to the .gitignore after you made the changes

score 0 · Answer 3 · answered Jan 28 '22 at 11:39

To perform git pull, we need to use the following commands. We also need to delete or undo the local changes in order to Pull for overwriting the local files. And after deleting the local changes with the help of git command, we again need to perform the git pull command in order to overwrite the local files from git.

Here are the commands that you can use to perform these tasks:

$git stash --include-untracked
$git clean -fd
$git pull

These commands will save the local changes on stash, then delete local changes from the git directory and then pull the files from git.

Unable do Git Pull

3 Answers3