Notre avis
Replit la branche de travail sur la branche du terminal, avec stash et restauration du travail en cours pour éviter toute perte.
Points forts
- Conserve les modifications non commitées en les stashant
- Évite de redéclencher le pipeline avec [skip line]
- Garantit qu'aucun travail n'est perdu pendant le rebase
Limites
- Nécessite la présence du fichier line.yaml
- Abandonne en cas de conflit (pas de résolution automatique)
- Ne fonctionne qu'avec les conventions du workflow 'line'
Utilisez cette compétence lorsque la ligne de statut indique que des changements sont en attente sur la branche du terminal à intégrer dans votre branche de travail.
Ne l'utilisez pas si vous souhaitez sélectionner uniquement certains commits plutôt que rebaser toute la branche du terminal.
Analyse de sécurité
SûrThe skill uses git stash, rebase, and unstash operations locally without network access, no destructive commands like force push or reset, and includes safeguards for conflicts.
Aucun point d'attention détecté
Exemples
The line statusline shows the terminal station has commits I haven't picked up. Please rebase my watched branch onto the terminal station.Check line.yaml, stash any pending changes, and rebase my current branch onto the latest terminal station, then restore my work.I have uncommitted work on my branch. Safely bring in the terminal station changes using rebase with stash./line-rebase
Safely pick up changes from the terminal station branch onto the watched branch.
When to use
Use this skill when the line statusline indicates there are commits ready on the terminal station branch that haven't been picked up on the main working branch.
Procedure
-
Identify branches: Read
line.yamlto determine the watched branch and the terminal (last) station. -
Check for changes: Verify the terminal station branch (
line/stn/<terminal>) has commits ahead of the watched branch. -
Stash current work: If there are any uncommitted changes on the watched branch, stash them:
git stash push -m "line-rebase: stashing WIP" -
Rebase from terminal station: Rebase the watched branch to include the terminal station's changes. All station commits contain
[skip line]markers, so they will NOT retrigger the assembly line (SKL-2):git rebase line/stn/<terminal> -
Restore work in progress: If changes were stashed in step 3, restore them:
git stash pop -
Verify: Confirm the watched branch now includes the station improvements and any WIP is restored.
Safety guarantees
- No work is ever lost: WIP is always stashed before any branch operations
- No retriggering: Station commits contain
[skip line]which preventsline runfrom retriggering (RUN-9, SKL-2) - Fast and automatic: The entire operation is a stash, rebase, unstash sequence
Important
- NEVER force-push or reset any branches
- ALWAYS stash before rebase, even if the working tree appears clean
- If the rebase has conflicts, abort and inform the user rather than auto-resolving
- Verify the stash was applied successfully after the rebase
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.