skills.rest
ArangoGutierrez
ArangoGutierrezCOMMUNITY
Explore all skills by this author →
Website𝕏@CarlosEArangoGitHub

babysit

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

3|Updated Jul 2, 2026
Search Tags:#automation#code review#pull request#github#merge conflicts#ci#bugbot
One-click install
npx skills add https://github.com/ArangoGutierrez/claude-toolkit --skill babysit-arangogutierrez
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: babysit
Source: https://github.com/ArangoGutierrez/claude-toolkit/tree/main/.cursor/skills-cursor/babysit
Command: npx skills add https://github.com/ArangoGutierrez/claude-toolkit --skill babysit-arangogutierrez

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Keeping a pull request merge-ready requires constant manual attention: triaging review comments, resolving merge conflicts, and chasing down CI failures. This Skill automates that loop so a PR reaches 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 comments (including Bugbot reports), filters out resolved threads, validates reported issues, and applies fixes only where the feedback is valid. - 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 CI until the PR is green and mergeable. - Use Case: You open a PR on Monday and receive reviewer comments plus a failing test overnight. Invoke this Skill to address valid feedback, push scoped fixes, and return to a green, merge-ready PR. ## Quick Start Use the babysit skill to get my current pull request to a merge-ready state by resolving comments, conflicts, and CI failures.

Frequently Asked Questions about babysit

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

FAQPage Schema
How do I automatically fix CI failures on a GitHub pull request?▼

Use this Skill to inspect the latest CI results, fix failures caused by the PR's own changes, and push scoped fixes. It re-watches CI until the checks pass, but never modifies CI workflows just to force a green build.

How to resolve merge conflicts in a pull request automatically?▼

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

Can it handle Bugbot review comments on pull requests?▼

Yes, it reviews unresolved Bugbot comments along with human feedback, filtering out resolved threads first. It validates each reported issue and only acts on valid ones, explaining when it disagrees or is unsure.

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

For merge-blocking failures outside the PR's scope, the Skill checks whether the branch is behind the base branch and merges the latest changes, since another merged PR may have already fixed the issue. It reports back rather than making unrelated changes.

When should I not use automated PR babysitting?▼

Avoid it when review feedback involves subjective design decisions or conflicting intents between branches, since the Skill aborts and asks for clarification in those cases. It also will not change CI workflows or make out-of-scope code changes to force a merge.

Related Skills

Explore More Software Engineering Skills→
JaimeJunrJaimeJunr
2

ship

Automate commits, branch creation, and pull request generation.

Community
Advanced
michael-menardmichael-menard

wt-finish

Completes unfinished Git feature branches by merging them into the base branch and cleaning up the worktree.

Community
Advanced
nntoannntoan

code-review-and-quality

Reviews code changes across correctness, readability, architecture, security, and performance before merge.

Community
Advanced
stars-endstars-end

fix-pr-feedback

Detect CI failures and review comments, create Beads issues, and push fixes to the branch.

Official
Intermediate