Git Merge Conflict Resolution Tool Setup Guide - Fix os.listdir Encoding Error in Python-Git Lock File Not Deleted: Quick Fix Guide

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.