Fix Git Merge Conflicts When Stash Changes Are Involved - Fix Git Merge Conflicts in VS Code: A Practical Guide-Windows Update Error 0x80070002 Component Reset Guide

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