fix-merge-conflicts

name	fix-merge-conflicts
description	Resolves merge conflicts conservatively and verifies the repo still builds. Use when the tree contains conflict markers or git reports unresolved merges.

Fix Merge Conflicts

Resolve conflicts by preserving intent, avoiding unrelated rewrites, and verifying the repository still passes the required checks.