Fix Git Merge Conflicts When Stash Changes Are Involved - Git Large File Storage Setup Tutorial-How to Access a Shared Folder on Network in Windows 10

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