Git Merge Conflict: Keep Both Files Instead of One - Fix Git index.lock File Exists Permission Denied Error-How to Fix Error 0x80070005 When Updating Windows

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