Fix Git Push Rejected: Non-Fast-Forward Error - Git Pull Merge Conflict: Step-by-Step Fix-Docker Container Exits on Startup: Logs and Fixes

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