Post

Beautiful. That's exactly what I set up two weeks ago. While evaluating different Markdown editors and finding ways to keep my sources in sync. 😘

1️⃣ Stop workspace conflicts in `.gitignore` #Obsidian constantly updates cursor positions, open tabs, and split sizes in `.obsidian/workspace.json`. Ignore `workspace*.json`, `.obsidian/cache/`, and `graph.json` to stop the majority of your daily merge conflicts.

2️⃣ Don't let #Git resurrect deleted notes #Obsidian moves deleted notes to `.trash/`. If Git tracks this folder, deleting a file on your laptop can cause it to reappear when pulling on your desktop. Add `.trash/` and OS noise (`.DS_Store`, `Thumbs.db`) to `.gitignore`.

3️⃣ Fix phantom diffs with `.gitattributes` Switching between macOS and Windows? Git's default line ending conversions can turn an entire untouched note into a phantom diff. Set `* text=auto eol=lf` in `.gitattributes` so every Markdown file is stored cleanly with LF.