Fix Windows Defender Blocked by Third-Party Antivirus - How to Resolve Git Merge Conflicts on the Same Line-Stop Windows Explorer from Restarting After Update

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.