Resolving Git Merge Conflicts After Cherry-Pick - Git Lock File Not Deleted: Quick Fix Guide-Resolve Docker Token Expired Access Denied

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