fix(babysit): resolve merge conflicts against staging during the review loop - #5695

Merged

TheodoreSpeaks merged 14 commits into

fix/babysit-merge-conflict-skill

Jul 16, 2026

Commits on Jul 15, 2026

fix(babysit): resolve merge conflicts against staging during the review loop
TheodoreSpeaks
committed
f6f4c94
fix(babysit): trim merge-conflict handling to essentials
TheodoreSpeaks
committed
daf4217
fix(babysit): gate conflict-resolution pushes and handle UNKNOWN mergeable
TheodoreSpeaks
committed
62dde5b
fix(babysit): bound persistent UNKNOWN mergeable state and clarify step skip
TheodoreSpeaks
committed
3744df5
fix(babysit): merge instead of rebase to resolve conflicts, drop force-with-lease
TheodoreSpeaks
committed
f6aea3a
fix(babysit): don't skip pending review findings when resolving a merge conflict
TheodoreSpeaks
committed
e3c5efe
fix(babysit): spot-check commit hygiene before a merge-conflict push
TheodoreSpeaks
committed
435e14c
fix(babysit): commit merge-conflict fixes before pushing, bound UNKNOWN before waiting
TheodoreSpeaks
committed
9d7612f

Commits on Jul 16, 2026