Resolving Git Merge Conflicts After Cherry-Pick - Fix Docker Compose .env File Not Loading-Git index.lock Error Troubleshooting Guide

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