Resolve Git Merge Conflicts in VS Code: Step-by-Step - Fix Git 'index.lock' Error in VS Code-Understanding and Fixing Git Non Fast Forward Error
Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.