Resolving Git Merge Conflicts After Cherry-Pick - Fix Docker Build Canceled with Verbose Logs-Docker Container Stops Immediately: Exit Code 0

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