Resolving Git Merge Conflicts in Binary Files - Fix NET::ERR_CERT_AUTHORITY_INVALID via Chrome Enterprise Policy-Resolve Git Non-Fast-Forward Push Error

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