clear-skies
From the author
Appa's clear skies for merge conflicts. Appa waits out the storm, then flies on once the sky is clear. Use for fix-merge-conflicts, /fix-merge-conflicts, "resolve the conflicts", "fix the merge conflict", "rebase broke", or a PR whose merge state is DIRTY. Resolves every conflict non-interactively with minimal edits, regenerates lockfiles with their tools, and proves the build and tests before staging.
Install
npx skills add tmcfarlane/team-avatar --skill clear-skies -a claude-code
Installs to .claude/skills/clear-skies/ · Each command fetches the skill straight from GitHub with the open skills CLI.
Byte-identical to the scanned commit, with the repository’s licence and a SOURCE.txt.
Want your agent to suggest skills while you type? See how to use skills from your IDE.
Safety checks on SKILL.md
- Contains a destructive command (rm -rf, force push, mkfs)Medium
Why 75
aiqbench computes the trust score from public signals. It is not a security audit, so read a skill before you install it.
Similar skills
Closest to this one by what they do and when they are used.
- safe-landingtmcfarlane/team-avatarAppa's safe landing for shipping a green stack. Appa never sets down until he has seen the ground is solid. Use for "land it", "ship the stack", "merge when ready", "merge it", or landing PRs after `long-flight` reports merge-ready. Verifies each PR independently, lands only the contiguous verified run from the root bottom-up under a head guard, and reads back every landing. Needs the user's landing authority.Other★ 111
- long-flighttmcfarlane/team-avatarAppa's long flight for PR care. Appa can fly for days and still bring everyone down safe. Use for babysit, /babysit, "babysit this", "get it green", "merge-ready", "address the review-bot comments", "check on PR X", "is it green", or "anything outstanding on X". Declares a mode, works the merge frontier one PR at a time through conflicts, review threads, and CI, and stops where the human's call begins.Engineering★ 111
- ase-repo-resolverse/aseResolve the Git merge conflicts of a working directory -- of an in-progress merge, rebase, cherry-pick, revert, stash apply, or of conflict markers left by patch -- carefully and semantically, never losing any change, escalate unresolvable hunks as-is, continue the in-progress operation, and emit a RESOLVED, PARTIAL, NONE, or FAILED verdict. Use when the user calls to "resolve" or "fix" merge conflicts.Engineering★ 60
- specsfy-specialist-merge-conflict-resolutionpromovaweb/specsfyResolver conflitos Git de merge ou rebase pela intenção de cada lado, preservando comportamento e validando integração. Use quando já existe operação com arquivos unmerged; não abortar, reescrever histórico remoto ou escolher um lado inteiro sem autorização.Planning★ 87
- ship-changeBlackBeltTechnology/pi-agent-dashboardShip an OpenSpec change after openspec-apply completes. When only QA/manual tasks remain, marks them done (tested later), archives + syncs specs, commits, pushes, opens a PR against develop, watches CI, waits for CodeRabbit, auto-applies safe fixes and re-pushes, loops until CI green + no actionable review threads, then squash-merges with branch delete and removes the worktree. Use after implementation is done and the change is ready to land. Triggers: "ship this change", "ship it", "land the change", "merge and clean up", "post-apply ship".Testing★ 335
- light-loadtmcfarlane/team-avatarAppa's light load for reviewability. Appa flies farthest when the saddle carries only what the trip needs. Use for make-pr-easy-to-review, /make-pr-easy-to-review, "make this easy to review", "tidy this PR", "clean up commits", or "annotate the diff". Cleans noisy history, sharpens the description, and adds reviewer guidance without changing code behavior.Engineering★ 111
Ratings & reviews
—
no reviews
Tried this skill? Rate it to help others. Sign in
Discussion
Join the discussion. Sign in