Skills Guide

Safe line rebase

VerifiedSafe

Safely incorporates commits from the terminal station branch into the main working branch. It stashes any uncommitted work before rebasing, ensuring no data loss, and uses [skip line] markers in station commits to prevent retriggering the assembly line. Particularly useful when the line status shows pending station updates.

Download and use
Sby Skills Guide Bot
DevelopmentIntermediate
6/2/2026
Claude Code
#git-rebase#line-workflow#stash#branching

Recommended for

Backend developerClaude CodeCode reviewFrontend developerFullstack developerRefactoring

Automated summary

Rebases the watched branch onto the terminal station branch, stashing and restoring work in progress to avoid data loss.

Strengths

  • Preserves uncommitted changes via stashing
  • Avoids retriggering the line pipeline with [skip line]
  • Ensures no work is lost during rebase

Limitations

  • Requires the line.yaml configuration to be present
  • Will abort if conflicts arise (no auto-resolve)
  • Only works with the specific 'line' workflow conventions
When to use it

Use when the line statusline indicates pending changes on the terminal station branch that need to be integrated into your working branch.

When not to use it

Do not use if you want to cherry-pick only specific commits instead of rebasing the entire terminal station branch.

Security analysis

Safe
Quality score92/100

The 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.

No concerns found

How this analysis is made

Examples

Pick up station changes
The line statusline shows the terminal station has commits I haven't picked up. Please rebase my watched branch onto the terminal station.
Synchronize with station
Check line.yaml, stash any pending changes, and rebase my current branch onto the latest terminal station, then restore my work.
Safe rebase from terminal
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

  1. Identify branches: Read line.yaml to determine the watched branch and the terminal (last) station.

  2. Check for changes: Verify the terminal station branch (line/stn/<terminal>) has commits ahead of the watched branch.

  3. Stash current work: If there are any uncommitted changes on the watched branch, stash them:

    git stash push -m "line-rebase: stashing WIP"

  4. 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>

  5. Restore work in progress: If changes were stashed in step 3, restore them:

    git stash pop

  6. 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 prevents line run from 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

From the file to a first result

The download contains exactly the content displayed on this page. This copy may differ from the latest version in the source repository.

View the source and supporting files

This download contains SKILL.md only. Any scripts, references, templates and dependencies are not included. Get the required files from the source, preserving their directory structure, before continuing.

1. Download the file

Download SKILL.md

From the root of a test project, save the file as .skill-downloads/safe-line-rebase-mm8o516p/SKILL.md, or use the command below. This folder is for inspecting the skill before installation.

Command for macOS/Linux or WSL: requires a POSIX shell and curl. On Windows without WSL, use the download button and create the folder manually.

mkdir -p '.skill-downloads/safe-line-rebase-mm8o516p' && curl --fail --show-error --location 'https://skills-guides.com/api/skills/safe-line-rebase-mm8o516p/download' --output '.skill-downloads/safe-line-rebase-mm8o516p/SKILL.md.part' && mv '.skill-downloads/safe-line-rebase-mm8o516p/SKILL.md.part' '.skill-downloads/safe-line-rebase-mm8o516p/SKILL.md'

2. Check prerequisites

Read SKILL.md before using it. If it references scripts or external services, inspect them and prepare the required access in your test environment.

No recognized prerequisites section in this file. This does not mean it is self-contained: libraries, tools and access requirements may be mentioned elsewhere in the content or source repository.

The platforms on this page are catalog indications. The paths below follow tool documentation; they do not prove this skill has been run in those tools. No minimum tool version is confirmed for this listing.

3. Load the skill

This file does not provide a usable name/description header for this native procedure. It remains available to download and inspect; use the manual method below.

Manual method or another tool: attach SKILL.md to a conversation, or open it in an agent that can read files. Include any required supporting resources. No universal folder is recognized by every tool.

4. Try a first task

Use a short, synthetic input: an API endpoint, a small document or an interface brief. In a new conversation, attach the file or give the agent its path, then adapt this request:

Read .skill-downloads/safe-line-rebase-mm8o516p/SKILL.md and apply its instructions to this example: [describe a test input]. Identify any missing files, dependencies or access. Produce the result requested by the skill without inventing data or running unreviewed scripts.

Expected result: output matching the skill instructions, or a precise list of missing prerequisites. A read confirmation alone does not validate a first use. If an external resource is unavailable, that path remains untested.

Related skills

React Hook Form Best Practices

Development

Master React Hook Form: avoid anti-patterns, manage subscriptions, and handle reset, dirty state, and controlled inputs correctly.

Claude CodeCursorWindsurf+2intermediateSafe 108,623
Skills Guide Bot

Emotion to Mantine Migration

Development

Migrate Emotion styled-components to Mantine components with style props and CSS modules. Use when converting .styled.tsx files or removing @emotion imports.

Claude CodeCursorWindsurf+1intermediateSafe 48,981
Skills Guide Bot

Scope Creep Detector

Development

Analyzes git diffs against a stated intent to detect scope creep, unrelated files, broad PRs, and oversized changes, then suggests keep, split, or justify actions.

Claude CodeCursorCodexintermediateSafe 135,015
Skills Guide Bot