git-rebase
A conservative approach to resolving Git conflicts while preserving intent and project standards.
Install
mkdir -p .claude/skills/git-rebase && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/17175" && unzip -o skill.zip -d .claude/skills/git-rebase && rm skill.zipInstalls to .claude/skills/git-rebase
Activation
This is the description your AI agent reads to decide when to run this skill — the better it matches your request, the more reliably it fires.
Resolve Git merge and rebase conflicts conservatively, preserving both sides' intent, staging only understood resolutions, and leaving a git-clean conflict state.Key capabilities
- →Understand every conflicted hunk before editing
- →Preserve important behavior from both sides of a conflict
- →Prefer smallest readable merge that keeps code idiomatic
- →Stage resolved files with `git add`
- →Report what was resolved and any unsafe files
- →Leave conflict unresolved if unsafe or unclear
How it works
The skill guides the resolution of Git conflicts by inspecting hunks, identifying changes from both sides, editing files to represent required behavior, and staging resolved files. It emphasizes conservative resolution and honest reporting.
Inputs & outputs
When to use git-rebase
- →Resolve git merge conflicts
- →Fix rebase conflicts
- →Clean up integration worktrees
About this skill
Git Rebase Conflict Resolution
Use this skill when Compozy asks you to resolve conflicts in an integration worktree. The goal is a clean merge result, not a clever shortcut.
Core Rules
- Understand every conflicted hunk before editing it.
- Preserve important behavior from both sides whenever possible.
- Prefer the smallest readable merge that keeps the code idiomatic for the affected language and project.
- Do not delete tests, weaken assertions, suppress lint, swallow errors, or otherwise hide a failing invariant.
- Do not commit. Compozy owns the final squash commit.
- Do not leave conflict markers in any file.
- If a conflict is unsafe or unclear, leave it unresolved so Compozy can abort and roll back honestly.
Required Workflow
- Inspect the conflicted files listed in the prompt.
- For each hunk, identify what the integration branch changed and what the incoming task changed.
- Edit the file so both sides' required behavior is represented.
- Run only language-specific formatting commands that are clearly required for the files you edited and are safe for this repository.
- Stage resolved files with
git add. - Check
git status --porcelain; no unmerged entries may remain. - Report what was resolved and any files that remain unsafe.
Resolution Guidance
- For Go files, keep error wrapping with
fmt.Errorf("context: %w", err). - For Go files, preserve
context.Contextpropagation and cancellation behavior. - Preserve synchronization ownership; do not introduce unmanaged background work.
- Keep tests focused on behavior and invariants, not implementation details.
- When both sides add cases to a table test, combine the cases unless they prove the same invariant twice.
- When both sides alter an interface, update every implementation instead of guessing from the conflicted file alone.
Fail-Honestly Criteria
Stop and leave the conflict unresolved when:
- you cannot tell which side owns the invariant,
- resolving would require deleting behavior from either side without evidence,
- conflict markers remain, or
- a binary/generated file conflict cannot be validated safely.
Compozy will roll back the integration branch when resolution is exhausted, so an honest unresolved conflict is safer than a speculative broken merge.
When not to use it
- →When deleting tests or weakening assertions
- →When suppressing lint or swallowing errors
- →When committing the final squash commit
Limitations
- →The skill does not allow committing the final squash commit.
- →The skill requires understanding of the conflicted hunk's intent.
- →The skill requires running language-specific formatting commands only when clearly required and safe.
How it compares
This workflow provides a structured and conservative approach to Git conflict resolution, focusing on preserving intent and idiomatic code, unlike an ad-hoc approach that might introduce regressions or unmanaged work.
Compared to similar skills
git-rebase side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| git-rebase (this skill) | 0 | 1mo | No flags | Intermediate |
| resolve-conflicts | 81 | 8mo | Review | Intermediate |
| dependency-upgrade | 26 | 5mo | Review | Intermediate |
| git-commits | 21 | 4mo | No flags | Beginner |
Try saying
Example prompts that trigger this skill in your AI assistant.
You might also like
resolve-conflicts
antinomyhq
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
dependency-upgrade
wshobson
Manage major dependency version upgrades with compatibility analysis, staged rollout, and comprehensive testing. Use when upgrading framework versions, updating major dependencies, or managing breaking changes in libraries.
git-commits
bonny
Create well-structured git commits in logical chunks following best practices
git-advanced-workflows
wshobson
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
github-multi-repo
ruvnet
Multi-repository coordination, synchronization, and architecture management with AI swarm orchestration
git-workflow-enforcer
CrazyDubya
Ensures commits follow conventional commits, branch naming conventions, and PR templates. Use when creating commits, branches, or PRs, or when user mentions git workflow.