Fix 'docker compose port already bound to host' Error - Fix Git Merge Conflicts on the Same Line-Resolving 'index.lock file exists' in Git

Operational follow-up

• Record the exact option, command, or setting that changed the result.
• Keep a rollback note if the workflow affects shared files or team settings.