Git Merge Unrelated Histories: When and How to Use --allow-unrelated-histories - Viewing the Diff in a Git Merge Conflict-Git Merge Tool Configuration 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.