Fix Git Merge Conflicts When Stash Changes Are Involved - How to Resolve pnpm Unsupported URL Type-Nginx Upstream Connection Refused: Causes and Fixes

Likely symptom
Likely cause
Safe rollback
Verification route
- Repeat the original action, not only a simplified test case.
- Restart the app or reload the service after configuration changes.