Git Merge Conflict Resolution Tool Setup Guide - How to Resolve Git Non-Fast-Forward and Permission Denied-Restore Windows Update Service After Clean Boot

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