Geek Answers Handbook

Git pull error for git update-index - files unchanged

I'm having trouble executing git pull origin master

I have files with local settings and are different from the original one. I marked them as not verified by the code->   git update-index --assume-unchanged html/index.php

Now, while the deleted index.php file is not changing, I can easily do it git pull, but when the index.php file is changing and I do the git traction creation wizard I get the following error   branch master -> FETCH_HEAD d532f8d..d01836e master -> origin/master error: Your local changes to the following files would be overwritten by
merge: html/index.php Please, commit your changes or stash them before you can merge. Aborting

Whenever I encounter this problem, I need to run a command   git update-index --no-assume-unchanged [filepath/filename]

then do git pull and then update this configuration file with my changes and run again   git update-index --assume-unchanged html/index.php

, , , ,

+4
1

--skip-worktree:

git update-index --no-assume-unchanged -- a file
git update-index --skip-worktree -- a file

. " 'assume-unchanged' 'skip-worktree'" : --skip-worktree git pull.

0

More articles:


All Articles