Fix 'Windows Cannot Access Shared Folder' After Update - Fixing Non Fast Forward Errors When Pushing to Git-Setup Git Mergetool for Conflict Resolution

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.