Git Merge Conflict: Keep Both Files Instead of One - How to Fix Docker Build Context Canceled in VS Code-Fix Git 'index.lock file exists' 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.