Git Merge Conflict Auto Resolve Not Working: Common Fixes - pnpm audit fix not working: common causes and fixes-How to Resolve Git Unrelated Histories Merge Conflict

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