Resolving Git Merge Conflicts After Cherry-Pick - Fix npm Run Build Out of Memory Errors-Fix Docker Volume Permission Denied for Nginx

Prepare
Execute
Validate
Document
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.