skills.rest
steveulrich
steveulrichCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

babysit

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

Updated May 28, 2023
Search Tags:#automation#code review#pull request#github#merge conflicts#triage#CI
One-click install
npx skills add https://github.com/steveulrich/ProjectB --skill babysit-steveulrich
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: babysit
Source: https://github.com/steveulrich/ProjectB/tree/main/.cursor/skills/babysit
Command: npx skills add https://github.com/steveulrich/ProjectB --skill babysit-steveulrich

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 maintenance loop so the PR stays green and unblocked 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), 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 latest base branch when failures appear unrelated, 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 the valid comments, push scoped fixes, and monitor CI until the PR is ready to merge. ## Quick Start Babysit my open pull request by resolving review comments, merge 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 keep a GitHub PR merge-ready?▼

Use a PR babysitting loop that checks PR status, unresolved comments, and CI results, then applies scoped fixes until everything is green. It resolves valid change requests, fixes CI failures caused by the PR, and merges the latest base branch when needed.

How to resolve merge conflicts without breaking either branch?▼

Resolve conflicts by preserving the intent and correctness of changes on both your branch and the base branch. When the two intents genuinely conflict and cannot be reconciled, abort the merge and ask the author for clarification instead of guessing.

Should I trust automated Bugbot review comments on pull requests?▼

Bugbot comments should be validated before acting on them. Check each reported issue against the actual code, fix only the reports that are valid, and explain your reasoning when you disagree or are unsure about a finding.

What should I do when CI failures are unrelated to my PR?▼

First check whether your branch is behind the base branch, since another merged PR may have already fixed the failure, and merge the latest changes. Never modify CI checks or workflows just to make failures pass; report the blocker instead.

When should a PR babysitting workflow stop and ask for help?▼

It should stop when merge conflict intents genuinely contradict each other, or when fixing a merge-blocking CI failure would require changing workflows or unrelated code. In those cases it reports back rather than making out-of-scope changes.

Related Skills

Explore More Software Engineering Skills→
sarkarshivaditya-labsarkarshivaditya-lab

pr-creation

Create GitHub pull requests with structured documentation, labels, linked issues, and verification summaries.

Community
Intermediate
the-agency-aithe-agency-ai
39

Post-Merge

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

Official
Advanced
erfanzarerfanzar
27

requesting-code-review

Automate pre-commit code review with static checks, linting, and auto-fixes.

Community
Advanced
FlatbreadLabsFlatbreadLabs
64

mergify-merge-queue

Inspect and control Mergify merge queues to diagnose stuck PRs.

Official
Intermediate