How to Merge Two Git Repositories with Unrelated Histories - Keep Both Files After Git Merge Conflict-Git Merge Unrelated Histories: A Practical 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.