Agent skill
20-02-authoritative-main-rebase
Execute a rebase onto main when main changes are authoritative and conflict-free, without merging.
Install this agent skill to your Project
npx add-skill https://github.com/majiayu000/claude-skill-registry/tree/main/skills/other/other/20-02-authoritative-main-rebase
SKILL.md
20.02 Authoritative-Main Rebase (Execute)
⛔ ONLY RUN THIS AFTER HUMAN CONFIRMED WITH [R]
Instructions:
When you are 100% sure a rebase would not drop changes from existing main (main changes generally are authoritative- if in any way you are not 100% sure ask hooman) then rebase - DO NOT MERGE YET
If you have a very complicated rebase- an advised strategy is to create a new temporary worktree in .worktrees/ to avoid conflict hell.
⛔ STOP HERE — WAIT FOR HUMAN
Report the rebase result. Do NOT proceed to merge (20.03).
The human must explicitly say [M] before you merge.
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
Didn't find tool you were looking for?