the-agency-ai/.claude/skills/rebase
.claude/skills/rebase/SKILL.md
DEPRECATED — use `git merge <target>` or `/sync` instead. Rebase is blocked by hookify.
$ install --global
skillsauthnpx skillsauth add the-agency-ai/the-agency .claude/skills/rebaseInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 20, 2026, 3:22 PM8.1s1 file scanned
SKILL.md
- description:
- DEPRECATED — use `git merge <target>` or `/sync` instead. Rebase is blocked by hookify.
<!--
Flag #62/#63: allowed-tools removed. Inherits Bash(*) from
.claude/settings.json. Restricting to specific subcommand patterns at the
skill level silently blocks agents on permission prompts the agent cannot
see — see dispatch #171 for the devex incident that surfaced this trap.
-->
Rebase (DEPRECATED)
This skill is deprecated. All branch synchronization now uses merge, not rebase.
Rebase rewrites history, breaks worktree merge-bases, and caused a fleet-wide data loss incident in a multi-worktree monorepo. See claude/REFERENCE-GIT-MERGE-NOT-REBASE.md for the full rationale and incident report.
Use Instead
| What you want | Use |
|---------------|-----|
| Sync your branch with master | git merge master |
| Sync local master with origin | /sync-all |
| Merge and push to origin | /sync |
| Sync worktree with master | /worktree-sync |
The block-raw-rebase hookify rule blocks all git rebase commands. This is intentional and enforced framework-wide.
Related Skills
the-agency-ai/src/claude/skills/worktree-sync
business
VerifiedTrustedCommunity
Sync worktree with master — merge, copy settings, run sandbox-sync, report changes
5SKILL.mdUpdated Apr 22, 2026
the-agency-ai/src/claude/skills/worktree-list
tools
VerifiedTrustedCommunity
List all git worktrees with status info (branch, clean/dirty, deps)
5SKILL.mdUpdated Apr 22, 2026
the-agency-ai/src/claude/skills/worktree-delete
tools
VerifiedTrustedCommunity
Remove a git worktree and optionally delete its branch
5SKILL.mdUpdated Apr 22, 2026
the-agency-ai/src/claude/skills/worktree-create
development
VerifiedTrustedCommunity
Create a new git worktree with dedicated branch and bootstrapped dev environment
5SKILL.mdUpdated Apr 22, 2026