ignore my changes in files but don't delete them from remote rep

git

Solution

Since `--assume-unchanged` doesn't work, you can try (`git update-index`):

git update-index --skip-worktree -- afile

(as mentioned in "Git - Difference Between '`assume-unchanged`' and '`skip-worktree`'")

Problem

I have several files in my working directory which exist in remote rep and I always change them for specific reason. Is it possible to make git to ignore those files while commiting, and same time those files should not be deleted from remote rep And when I pull changes from remote rep those files should not be merged Is it possible to do this? P.S. `git update-index --assume-unchanged` doesn't help as `git pull` will try to merge files anyway

Original source

Related problems