How to Allow Unrelated Histories in Git Merge - Resolve Python Dependency Conflicts in Virtualenv-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.