Git Merge Conflict: Keep Both Files Instead of One - How to Rebuild Search Index After Windows Upgrade-VS Code Source Control Not Detecting Changes Permission Denied Fix

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.