Resolving Git Merge Conflicts After Cherry-Pick - Cloudflare 522 Error Checklist: Causes and Fixes-Fix Stuck Git Lock File Error

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.