rebase

Étoiles6

Forks1

Mis à jour2 juin 2026 à 09:07

Complete a git rebase, resolving conflicts along the way

Installation

Installer avec Codex ou Claude Copiez ce prompt, collez-le dans Codex, Claude ou un autre assistant, puis laissez-le vérifier la page du skill et l'installer pour vous.

Exécuter dans Manus

Source

p2kmgcl

p2kmgcl/chachi-shell

Ouvrir le dépôt GitHub Voir les dépôts du créateur

Téléchargement

Exécuter dans Manus

Métiers associésSOC

Basé sur la classification professionnelle SOC

Développeurs de logicielsProfessions informatiques et mathématiques·SOC 15-1252

SKILL.md

readonly

name	rebase
description	Complete a git rebase, resolving conflicts along the way

Start or detect rebase.
- If a rebase is in progress, skip to step 2.
- If no rebase is in progress, ask the user which branch to rebase onto and start the rebase.
Loop until the rebase is complete:
- Check for conflicts:
  - If there are no conflicts, the rebase step succeeded — run git rebase --continue and repeat the loop.
  - For every conflicted file:
    - If the resolution is clear (eg. one side is a strict superset, a trivial formatting change, an import reorder, or the intent of both sides is obvious), resolve it directly using the Edit tool. Remove all conflict markers and produce the correct merged result.
    - If the resolution is ambiguous (e.g., both sides make substantive but different changes to the same logic, or you cannot determine which behavior the user intends), explain the conflict to the user with both sides' intent and ask how to proceed. Do NOT guess.
- Continue the rebase.

Plus depuis ce dépôt

même dépôt

review-pr

p2kmgcl/chachi-shell

Reviews a GitHub PR and creates a pending review with editorially gated inline/body findings. Use when the user asks to review a PR or create a draft GitHub review.

2026-07-016

local-rules

p2kmgcl/chachi-shell

Load machine-local rule overrides for a given skill from the shared ~/.agents skills directory.

2026-06-026

commit

p2kmgcl/chachi-shell

Create one or more atomic commits from current changes, grouping by logical unit

2026-06-026

create-ticket

p2kmgcl/chachi-shell

Create a JIRA ticket interactively — gathers requirements through conversation, proposes the ticket, and creates it after approval

2026-06-026

grill-with-docs

p2kmgcl/chachi-shell

Grilling session that challenges your plan against the existing domain model, sharpens terminology, and updates documentation (CONTEXT.md, ADRs) inline as decisions crystallise. Use when user wants to stress-test a plan against their project's language and documented decisions.

2026-06-026

handoff

p2kmgcl/chachi-shell

Compact the current conversation into a handoff document for another agent to pick up.

2026-06-026

name	rebase
description	Complete a git rebase, resolving conflicts along the way

Start or detect rebase.
- If a rebase is in progress, skip to step 2.
- If no rebase is in progress, ask the user which branch to rebase onto and start the rebase.
Loop until the rebase is complete:
- Check for conflicts:
  - If there are no conflicts, the rebase step succeeded — run git rebase --continue and repeat the loop.
  - For every conflicted file:
    - If the resolution is clear (eg. one side is a strict superset, a trivial formatting change, an import reorder, or the intent of both sides is obvious), resolve it directly using the Edit tool. Remove all conflict markers and produce the correct merged result.
    - If the resolution is ambiguous (e.g., both sides make substantive but different changes to the same logic, or you cannot determine which behavior the user intends), explain the conflict to the user with both sides' intent and ask how to proceed. Do NOT guess.
- Continue the rebase.