Resolving Git Merge Conflicts After Cherry-Pick - How to Resolve ERR_CONNECTION_RESET by Clearing Cache-Git Binary Merge Conflict: Practical Solutions

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.