Resolving Git Merge Conflicts After Cherry-Pick - Dealing with pip's Externally Managed Environment Warning-How to Handle Git Merge Conflicts: A Checklist
Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.