Fix VS Code Git Not Detecting Changes After .gitignore Update - Fix Git Merge Conflict Auto Resolve Failures-Setup.py Dependency Conflict Troubleshooting

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