Resolving Git Merge Conflicts After Cherry-Pick - Windows 11 Assistant Stuck: Disk Space Troubleshooting-Fix Docker Build Canceled with Verbose Logs

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.