Fix Git Merge Conflicts When Stash Changes Are Involved - Cloudflare Origin Certificate Setup Checklist-Prevent Git Index Lock File Creation: Practical Fixes

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