skills.rest
GreenFirst-kr
GreenFirst-krOFFICIAL
Explore all skills by this author →
GitHub

git-rebase

Resolve Git merge or rebase conflicts with automated or user-escalated decisions.

Updated Aug 23, 2026
Search Tags:#git#safety#rebase#conflicts#ai-assisted#decision-tree#build-verification
One-click install
npx skills add https://github.com/GreenFirst-kr/green_first_be --skill git-rebase-greenfirst-kr
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-rebase
Source: https://github.com/GreenFirst-kr/green_first_be/tree/main/.claude/skills/git/rebase
Command: npx skills add https://github.com/GreenFirst-kr/green_first_be --skill git-rebase-greenfirst-kr

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve Git merge/rebase conflicts safely by applying an AI-guided workflow with clear decision criteria. It covers common conflict scenarios, promotes automated resolutions when safe, and escalates for user input on business-logic or safety concerns. It enforces a build verification step and prohibits risky operations on protected branches, ensuring reliable and auditable outcomes.

Core Features & Use Cases

  • Conflict detection & decision support: identifies conflict types and suggests safe auto-resolve vs escalation.
  • Safety-first rules: enforces checks like build verification after resolution and prohibits risky actions on protected branches.
  • Guided decision tree: provides structured steps to resolve conflicts or escalate to user when needed.
  • In-context guidance: explains how to read conflicts, apply safe resolutions, and verify with a build.

Quick Start

Activate the git-rebase skill when a rebase conflict occurs and follow the decision tree to auto-resolve or escalate to the user.

Frequently Asked Questions about git-rebase

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

FAQPage Schema
How do I resolve Git rebase conflicts safely without breaking the build?▼

To resolve Git rebase conflicts safely, use an AI-guided workflow that applies a structured decision tree to automate safe fixes and escalates business-logic conflicts for user input. It enforces a build verification step to ensure reliable outcomes.

What is the best way to automate Git merge conflict resolution?▼

The best way to automate Git merge conflict resolution is by applying an AI-guided decision tree that identifies conflict types, suggests safe automated resolutions, and escalates safety or business-logic concerns for human review.

When should I escalate Git conflicts instead of auto-resolving them?▼

You should escalate Git conflicts when they involve business-logic decisions or safety concerns. The AI-guided workflow prohibits risky operations on protected branches and prompts for user input when automated resolution is not safe.

Can I run a Git rebase on protected branches?▼

No, performing risky Git rebase operations on protected branches is explicitly prohibited. The safety-first workflow enforces this constraint to prevent unauthorized modifications and ensure auditable outcomes.

Why do I need build verification after resolving merge conflicts?▼

Build verification after merge conflicts is required to enforce safety and ensure reliable outcomes. It validates that the automated or manual conflict resolution did not introduce syntax errors or break existing functionality.

Related Skills

Explore More Software Engineering Skills→
Clay-HHKClay-HHK
2

git-workflow

Provide standardized Git workflow guidance for commits, branching, merging, and tagging.

Community
Intermediate
Jamie-CuiJamie-Cui
28

finishing-a-development-branch

Finalize feature branches with pre-integration checks and merge strategy guidance.

Community
Intermediate
muggl3mindmuggl3mind
24

evals

Performs static, runtime, and health evaluations of job-search pipeline code and outputs.

Community
Advanced
ohyesgocoolohyesgocool

address-review

Triage and resolve code-review feedback on merge requests.

Community
Advanced