Resolving Git Merge Conflicts After Cherry-Pick - Resolve Outlook Search Index Issues in Windows-Git Push Rejected Non-Fast-Forward: Step-by-Step Fix

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