Theodore Li db9f165805 fix(babysit): resolve merge conflicts against staging during the review loop (#5695) ...

* fix(babysit): resolve merge conflicts against staging during the review loop

* fix(babysit): trim merge-conflict handling to essentials

* fix(babysit): gate conflict-resolution pushes and handle UNKNOWN mergeable

* fix(babysit): bound persistent UNKNOWN mergeable state and clarify step skip

* fix(babysit): merge instead of rebase to resolve conflicts, drop force-with-lease

* fix(babysit): don't skip pending review findings when resolving a merge conflict

* fix(babysit): spot-check commit hygiene before a merge-conflict push

* fix(babysit): commit merge-conflict fixes before pushing, bound UNKNOWN before waiting

* fix(babysit): run pre-push checks before committing the merge-conflict fix

* fix(babysit): bound persistent CONFLICTING state and fix pre-push check order

* fix(babysit): reconcile hard rule with step 2's merge-conflict sync exception

* fix(babysit): page all review threads before branching on mergeable state

* fix(babysit): cut merge-conflict handling down to the essentials

* fix(babysit): simplify merge-conflict handling to a minimal step

2026-07-16 03:37:42 -04:00

..

commands

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

2026-07-16 03:37:42 -04:00

rules

improvement(landing): refine hero and mothership visuals (#5181)

2026-06-30 13:50:04 -07:00

skills/add-hosted-key

feat(providers): server-side credential hiding for Azure and Bedrock (#3884)

2026-04-01 16:27:54 -07:00