TIL: git update-index –skip-worktree <filename>

TIL about this option.

git update-index --skip-worktree .obsidian/workspace.json

I have Obsidian on multiple machines synced via Git, and I’m always wrestling with .obsidian/workspace.json conflicts. Today I thought, “Enough is enough,” and decided to fix this.

Looks like with this option, I can set it so that local changes are persisted even if the remote file has changed.