Resolve Git Merge Conflicts in VS Code: Step-by-Step - Git Merge vs Rebase Conflicts: Key Differences and Fixes-Fixing 'Permission Denied' in Windows VSCode Terminal

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.