skills.rest
williamw
williamwCOMMUNITY
Explore all skills by this author →
GitHub

git-rebase

Automates git rebase onto latest main with conflict resolution and safety checks.

Updated Aug 23, 2026
Search Tags:#git#branch management#merge conflicts#rebase#codebase maintenance
One-click install
npx skills add https://github.com/williamw/agent-skills --skill git-rebase-williamw
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-rebase
Source: https://github.com/williamw/agent-skills/tree/main/skills/git-rebase
Command: npx skills add https://github.com/williamw/agent-skills --skill git-rebase-williamw

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

The git-rebase skill addresses the complexity and potential frustration of manually rebasing a feature branch onto the main branch, especially when dealing with merge conflicts and rebase hangs.

Core Features & Use Cases

  • Automated Rebase: Handles the rebase process, including fetching the latest main branch and applying commits.
  • Conflict Resolution: Provides step-by-step guidance to resolve merge conflicts without opening an interactive editor.
  • Safety Checks: Ensures no uncommitted changes before starting the rebase and verifies the branch is not main.
  • Verification: Checks the rebase completion, runs tests, and performs a smoke test of the application.
  • Force Push: Handles the force push operation to update the remote branch after rebase completion.
  • Use Case: Ideal for developers who want to ensure a smooth rebase process, particularly when dealing with large feature branches or complex merge conflicts.

Quick Start

Run the 'git-rebase' skill to rebase your feature branch onto the latest main branch.

Frequently Asked Questions about git-rebase

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

FAQPage Schema
How do I rebase a feature branch onto main without getting stuck on merge conflicts?▼

You can rebase a feature branch onto main without interactive editor hangs by using automated conflict resolution. This skill fetches the latest main branch, applies commits, and provides step-by-step guidance to resolve merge conflicts safely.

What is the safest way to rebase a large feature branch with complex conflicts?▼

The safest way to rebase a large feature branch involves running pre-rebase safety checks to ensure no uncommitted changes exist and verifying the branch is not main. Automated conflict resolution and post-rebase test verification then secure the process.

Do I need a testing suite to rebase my codebase onto the main branch?▼

Yes, a testing suite is required to rebase your codebase onto the main branch using this skill. After applying commits and resolving conflicts, it runs tests and performs a smoke test to validate application integrity before completing the force push operation.

How do I handle a force push to update the remote branch after a rebase?▼

To handle a force push to update the remote branch after a rebase, this skill automates the operation once conflict resolution and local testing are complete. It ensures the remote feature branch reflects the newly rebased commit history.

Why does my git rebase hang when dealing with merge conflicts?▼

Your git rebase hangs when dealing with merge conflicts because it typically opens an interactive editor requiring manual input. This skill bypasses the interactive editor by providing step-by-step guidance to resolve conflicts directly in the workflow.

Related Skills

Explore More Software Engineering Skills→
SuniljitSuniljit

git-branch-cleanup

Switch to main, rebase pull, and delete the original Git branch.

Community
Advanced
bswrundquistbswrundquist

push

Push local commits to a remote Git repository with safety checks.

Community
Intermediate
NebulavenusNebulavenus
36

dev-update-working-branch

Fetch origin/main, fast-forward local main, and rebase the current branch onto main.

Community
Intermediate
geoffjaygeoffjay
8

git-advanced

Guide interactive rebases, commit surgery, and history manipulation in Git.

Community
Advanced