Fix Git Merge Conflicts When Stash Changes Are Involved - Fix Windows Explorer Restart Loop-Resolve Docker Mount Permission Denied macOS

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