Git Merge Conflict Checklist Before Merging - How to Fix Git Push Rejected Non-Fast-Forward Upstream-Fix 'port already allocated' for Nginx in Docker Compose

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