git-rebase-workflow

Automate safe local branch rebasing with readiness checks and conflict logging.

7|Updated Feb 14, 2026
One-click install
npx skills add https://github.com/KentoShimizu/sw-agent-skills --skill git-rebase-workflow
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-rebase-workflow
Source: https://github.com/KentoShimizu/sw-agent-skills/tree/main/skills/git-rebase-workflow
Command: npx skills add https://github.com/KentoShimizu/sw-agent-skills --skill git-rebase-workflow

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes assets (resource) and references (resource) components.

What problem does it solve?

Linearize local branch history with safe rebase practices before integration, reducing risks from rewritten history and conflicts.

Core Features & Use Cases

  • Rebase readiness checks to ensure branch can be rebased without violating policy.
  • Conflict-aware rebasing with documented resolutions and an auditable log.
  • History hygiene tools for reorganizing commits under controlled guidelines; safe interruption handling.
  • Policy enforcement using provided safety rules and templates to minimize risk.

Quick Start

Apply this skill to your feature branch to validate rebase eligibility, perform a safe rebase, and record the results for audit.

Frequently Asked Questions about git-rebase-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I perform a safe git rebase without losing commit history?

A safe git rebase requires branch eligibility checks and adherence to force-with-lease policies. This skill automates local branch rebasing by validating readiness, logging conflicts, and ensuring history cleanup is auditable before merging.

What is the best way to linearize feature branch history before merging?

Linearizing feature branch history involves applying rebase readiness checks and documenting conflict resolutions. This skill reorganizes commits under controlled guidelines to ensure history hygiene and safe interruption handling during the workflow.

How do I resolve and log git rebase conflicts for an audit?

Conflict-aware rebasing requires documenting resolutions and generating an auditable log. This skill applies conflict resolution during local rebases and records the results using provided safety rules and templates for compliance tracking.

Can I automate rebase readiness verification for a local feature branch?

Yes, rebase readiness verification can be automated. This skill checks if a branch can be rebased without violating policy, applying readiness checklists and safety rules to ensure the branch is eligible for history cleanup.

Does git force-with-lease policy enforcement work with automated rebasing?

Force-with-lease policies are enforced during automated rebasing to minimize risks from rewritten history. This skill integrates these safety rules to protect local branch history when linearizing commits before integration.

When should I avoid rebasing a local git branch?

You should avoid rebasing when a branch fails readiness checks or violates safety policies. This skill helps identify these constraints by verifying rebase eligibility and enforcing force-with-lease rules before any history cleanup occurs.