Fix Git Lock File Not Deleted After Crash - Resolving Git Merge Conflicts After Cherry-Pick-Windows Search Not Working After Update Fix

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.