Resolving Git Merge Conflicts After Cherry-Pick - How to Clear Unresolved Paths in Git Rebase-Python stdin Encoding Error Fix

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