Resolving Git Merge Conflicts in Binary Files - Troubleshoot Git Merge Conflict Exit Code 128-Git Cherry-Pick Conflict Resolution Guide
Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.