skills.rest
mhawthorne
mhawthorneCOMMUNITY
Explore all skills by this author →
Website𝕏@mhawthorneGitHub

gza-rebase

Rebase the current Git branch onto main with interactive conflict resolution.

11|1|Updated Jan 6, 2026
Search Tags:#git#workflow#interactive#rebase#branch-management#conflicts
One-click install
npx skills add https://github.com/mhawthorne/gza --skill gza-rebase
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: gza-rebase
Source: https://github.com/mhawthorne/gza/tree/main/src/gza/skills/gza-rebase
Command: npx skills add https://github.com/mhawthorne/gza --skill gza-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebase and integrate changes from the latest main branch into your feature branch, resolving conflicts interactively to maintain a clean history.

Core Features & Use Cases

  • Interactive conflict resolution during rebases to preserve both sides' changes
  • Pre-flight checks and target selection between origin/main or main
  • End-to-end rebase workflow with optional auto mode and conflict handling

Quick Start

Rebase your current branch onto origin/main and resolve conflicts interactively.

Frequently Asked Questions about gza-rebase

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

FAQPage Schema
How do I rebase a git branch onto the latest main while resolving merge conflicts interactively?▼

To rebase a git branch onto main interactively, the Skill performs pre-flight checks, fetches the target, and pauses during conflicts to prompt for resolution. This preserves both sides' changes while integrating recent updates.

What is the best way to handle conflict-heavy rebases in a feature branch workflow?▼

Handling conflict-heavy rebases requires fetching the latest main and walking through resolution prompts. The Skill supports this workflow by interactively resolving conflicts during the rebase to maintain a clean history.

Can I automate git rebase conflict resolution and push behavior without manual prompts?▼

You can automate git rebase conflict resolution using the Skill's optional auto mode. This mode performs automated resolution and handles push behavior end-to-end without requiring interactive conflict prompts.

Does this rebase workflow support target selection between local main and origin/main?▼

The rebase workflow supports target selection between local main and origin/main. Pre-flight checks determine the appropriate target branch before fetching commits and initiating the integration process.

When do I need to run pre-flight checks before rebasing a feature branch?▼

Pre-flight checks are needed before rebasing a feature branch to validate the state of your repository and select the correct target. This ensures a clean rebase onto the latest main without unexpected errors.

Why use interactive conflict resolution during a git rebase instead of a standard merge?▼

Interactive conflict resolution during a git rebase allows you to preserve both sides' changes step-by-step. This maintains a clean, linear project history compared to a standard merge commit.

Related Skills

Explore More Software Engineering Skills→
cbleckercblecker
5

rebasing-branch

Rebase a feature branch onto an updated base branch with conflict guidance.

Community
Basic
AbildtoftAbildtoft
2

kramme:rebase-pr

Rebase the current branch onto the latest base branch and force-push with --force-with-lease.

Community
Advanced
flutterflutter
2.8k

definition-of-done

Enforce formatting, static analysis, and test verification for Dart projects.

Official
Intermediate
JHostalekJHostalek
10

merge

Integrates a target branch into the current branch with conflict resolution and quality-gate inspection.

Community
Advanced