Notre avis
Effectue le commit, le rebase et la fusion d'une branche de fonctionnalité dans sa branche de base configurée, en évitant les fusions dans main ou master.
Points forts
- Empêche les fusions accidentelles dans main/master
- Utilise des commits conventionnels avec un co-auteur
- Gère la résolution des conflits en préservant les modifications des deux branches
- Branche de base configurable par branche
Limites
- Ne fonctionne qu'avec une branche de base configurée via git config
- Ne récupère pas les mises à jour distantes avant le rebase
- Si la résolution de conflit est trop complexe, demande de l'aide
Utilisez cette compétence pour intégrer une branche de fonctionnalité dans sa branche de base avec un historique propre sans risquer main.
Ne l'utilisez pas si vous devez fusionner dans main/master ou si la branche de base nécessite des mises à jour distantes avant le rebase.
Analyse de sécurité
SûrOnly uses git operations within the current repository, with explicit safeguards against merging into main/master and force pushing. No dangerous commands or data exfiltration.
Aucun point d'attention détecté
Exemples
Merge my current branch into its configured base branch.Commit staged changes and merge this feature branch into its base.Please run the merge skill to integrate the current branch into its base, resolving any conflicts.name: merge description: Commit, rebase, and merge the current branch into its base branch (never main). disable-model-invocation: true allowed-tools: Read, Bash, Glob, Grep
Safety Rules
CRITICAL — these rules must NEVER be violated:
- NEVER merge into
mainormaster. If the resolved base branch ismainormaster, stop immediately and inform the user. - NEVER force push. Do not use
--force,--force-with-lease, or-fwithgit push.
Step 1: Verify Branch
git branch --show-current
If the current branch is main or master, STOP and tell the user they must be on a feature branch.
Step 2: Commit
If there are staged changes, commit them.
- Run
git log --format="%s" -n 20to detect the repo's commit convention and match it. - If no clear convention exists, default to conventional commits with a scope, e.g.
feat(auth): add login endpoint. - Always include a co-author trailer:
Co-Authored-By: Claude <noreply@anthropic.com> - Skip if nothing is staged.
Step 3: Determine Base Branch
git config --local --get "branch.$(git branch --show-current).workmux-base" 2>/dev/null
If no base branch is configured, STOP and tell the user no base branch is set. Do NOT default to main.
If the base branch is main or master, STOP and tell the user: "Refusing to merge into main/master. Set a different base branch or use /pr instead."
Step 4: Rebase
Rebase onto the local base branch (do NOT fetch from origin first):
git rebase <base-branch>
IMPORTANT: Do NOT run git fetch. Do NOT rebase onto origin/<branch>. Only rebase onto the local branch name.
If conflicts occur:
- BEFORE resolving any conflict, understand what changes were made to each conflicting file in the base branch
- For each conflicting file, run
git log -p -n 3 <base-branch> -- <file>to see recent changes - Preserve BOTH the base branch changes AND our branch's changes
- After resolving each conflict, stage the file and continue with
git rebase --continue - If a conflict is too complex or unclear, ask for guidance
Step 5: Merge
Run: workmux merge --rebase --notification
Expert Next.js App Router
Developpement
Un skill qui transforme Claude en expert Next.js App Router.
Générateur de README
Developpement
Crée des README.md professionnels et complets pour vos projets.
Rédacteur de Documentation API
Developpement
Génère de la documentation API complète au format OpenAPI/Swagger.