skills.rest
kkkaoru
kkkaoruCOMMUNITY
Explore all skills by this author →
𝕏@kkk4oruGitHub

babysit

Triages PR comments, resolves merge conflicts, and fixes CI until merge-ready.

Updated Oct 15, 2019
Search Tags:#automation#code review#pull request#github#merge conflicts#triage#ci
One-click install
npx skills add https://github.com/kkkaoru/dotfiles --skill babysit-kkkaoru
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: babysit
Source: https://github.com/kkkaoru/dotfiles/tree/main/.cursor/skills-cursor/babysit
Command: npx skills add https://github.com/kkkaoru/dotfiles --skill babysit-kkkaoru

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Keeping a pull request merge-ready requires constant manual attention: responding to review comments, resolving merge conflicts, and chasing down CI failures. This Skill automates that loop so a PR converges to a mergeable state without repeated manual intervention. ## Core Features & Use Cases - Merge Conflict Resolution: Intelligently resolves conflicts while preserving the intent of both branches, and aborts to ask for clarification when intents genuinely conflict. - Comment Triage: Reviews unresolved review threads (including Bugbot reports), applies valid change requests, and explains disagreements with invalid ones. - CI Repair Loop: Fixes CI failures caused by the PR's own changes, merges the base branch when failures come from upstream, and re-watches checks until green. - Use Case: You open a PR on Monday and reviewers plus CI leave feedback overnight. Invoke this Skill to address valid comments, resolve conflicts with main, push scoped fixes, and iterate until the PR is mergeable. ## Quick Start Ask the agent to babysit this pull request and keep fixing comments, conflicts, and CI failures until it is ready to merge.

Frequently Asked Questions about babysit

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automatically fix PR review comments and CI failures?▼

Invoke the babysit workflow on the pull request. It fetches unresolved review comments, applies valid change requests, fixes CI failures caused by the PR's changes, pushes scoped fixes, and re-watches checks until the PR is mergeable.

How does the skill handle merge conflicts in a pull request?▼

It resolves merge conflicts by preserving the intent and correctness of changes on both the PR branch and the base branch. If the two intents genuinely conflict, it aborts the merge and asks for clarification instead of guessing.

Does it act on every Bugbot comment automatically?▼

No. It validates each Bugbot report and only takes action on issues that are confirmed valid. When it disagrees with or is unsure about a report, it explains the reasoning instead of making unverified changes.

Will it modify CI workflows to make failing checks pass?▼

No. It never changes CI checks or workflows just to make failures pass, and it avoids unrelated code changes. If a fix would require that, it reports back instead of proceeding.

What happens when CI failures are unrelated to my PR?▼

For merge-blocking failures that appear unrelated, it checks whether the branch is behind the base branch and merges the latest changes, since another merged PR may have already fixed the failure.

Related Skills

Explore More Software Engineering Skills→
wyattjohwyattjoh
1

pr-fix

Triage GitHub pull request review comments and failing CI checks.

Community
Advanced
the-agency-aithe-agency-ai
39

Post-Merge

Verify merged pull requests, merge origin updates, and create GitHub releases.

Official
Advanced
Open-PawsOpen-Paws
3

code-review

Automate layered code review for pull requests in CI pipelines.

Official
Advanced
ArangoGutierrezArangoGutierrez
3

babysit

Triages PR comments, resolves merge conflicts, and fixes CI until merge-ready.

Community
Intermediate