Fixing Unresolved Paths After Git Merge Conflict Rebase - Troubleshooting pnpm Stuck on Resolving Dependencies-Resolving 'index.lock file exists' in Git on macOS

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.