Resolving Git Merge Conflicts After Cherry-Pick - Fixing Python Memory Errors When Generating Large Files-pnpm Lockfile Conflict Fix Guide

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