Git技术问题：如何忽略文件避免拉取/推送/合并修改本地配置

Got it, let’s tackle this tricky scenario. You’ve got a tracked config file that you’ve modified locally, and you need it to stay untouched by pull, push, checkout, and merge operations—plus you don’t want git remove to be able to delete it from your project. Standard tricks like .gitignore or assume-unchanged might fall short here, so here’s a robust, multi-layered approach:

1. Mark the file as "skip-worktree" #

This is a more powerful alternative to assume-unchanged—it tells Git to completely ignore any changes to the file in your working directory, and never attempt to overwrite it with remote updates or branch switches. It also hides local modifications from git status, so you won’t be tempted to commit or push them by accident.

Run this command in your repository root:

git update-index --skip-worktree path/to/your/config-file.ext

To confirm the flag is active, run:

git ls-files -v | grep '^S'

You’ll see your config file listed with an S prefix, which confirms the skip-worktree setting is applied.

2. Lock the file at the filesystem level to block git remove #

Even with the skip-worktree flag, someone might accidentally run git rm -f to delete the file. To prevent this entirely, we’ll make the file immutable at the OS level, so Git (or any process) can’t modify or delete it without explicit unlock permission.

On Linux/macOS: #

chmod +i path/to/your/config-file.ext

This sets the "immutable" bit—no user (even root) can delete or alter the file until you unset the flag with chmod -i.

On Windows: #

Open Command Prompt as Administrator and run:

attrib +r +s path\to\your\config-file.ext

The +r marks it as read-only, and +s sets it as a system file, making it nearly impossible for Git to delete or modify it.

3. Verify the protections work #

Test each operation to ensure your config file stays safe:

• Pull/merge/checkout: Try pulling from remote or switching branches—your local modified file will remain untouched, no overwrites or merge conflicts.
• Push: Git won’t attempt to push your local changes to the remote, since skip-worktree hides the modifications entirely.
• Git remove: Running git rm path/to/your/config-file.ext will fail outright (even with -f, the filesystem lock will block deletion).

Reverting the changes (if needed later) #

If you ever want to resume tracking the file normally:

1. Unlock the filesystem lock:
   • Linux/macOS: chmod -i path/to/your/config-file.ext
   • Windows: attrib -r -s path\to\your\config-file.ext
2. Clear the skip-worktree flag:

   git update-index --no-skip-worktree path/to/your/config-file.ext
   

内容的提问来源于stack exchange，提问作者Deepak Dixit