skills.rest
fotoetienne
fotoetienneCOMMUNITY
Explore all skills by this author →
Website𝕏@stephenspaldingGitHub

git-rebase

Automate git rebase with conflict resolution using PR and issue context.

11|Updated Dec 1, 2025
Search Tags:#git#merge conflicts#rebase#code collaboration#automated workflow
One-click install
npx skills add https://github.com/fotoetienne/gru --skill git-rebase-fotoetienne
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-rebase
Source: https://github.com/fotoetienne/gru/tree/main/.claude/skills/git-rebase
Command: npx skills add https://github.com/fotoetienne/gru --skill git-rebase-fotoetienne

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires git, and includes scripts (resource) components.

What problem does it solve?

The git-rebase Skill solves the problem of manually rebasing a git branch, which can be complex and prone to conflicts. It automates the process and offers intelligent conflict resolution, making the task more manageable and less error-prone.

Core Features & Use Cases

  • Automated Rebase: Handles the rebasing process automatically, fetching the latest default branch and rebase the current branch.
  • Intelligent Conflict Resolution: Uses context from PRs and issues to resolve merge conflicts intelligently.
  • User Input for Ambiguities: In cases of ambiguous conflicts, prompts the user for input while providing context and options.
  • Use Case: Imagine you need to update your feature branch to the latest main branch. Using this Skill, you can initiate the rebase, and it will handle most of the process automatically, with guidance for any conflicts it encounters.

Quick Start

To start a rebase of your current branch onto the default branch, simply use the command: skill: git-rebase.

Frequently Asked Questions about git-rebase

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

FAQPage Schema
How do I automate git rebase and resolve merge conflicts?▼

Automating git rebase resolves merge conflicts by fetching the latest default branch and reapplying commits. It intelligently handles conflicts using PR and issue context, prompting for user input only when ambiguities require manual guidance.

What is the best way to handle complex git workflows with frequent rebasing?▼

Complex git workflows with frequent rebasing are handled by automating the rebase process against the default branch. The system fetches upstream changes and intelligently resolves conflicts using available PR and issue context to minimize manual intervention.

Does automated git rebase work with existing PR and issue context?▼

Automated git rebase works with PR and issue context by using them to inform intelligent conflict resolution. When conflicts arise, the system evaluates this context to automatically resolve issues or presents options to the user for ambiguous cases.

How do I rebase my current branch onto the default branch?▼

Rebasing your current branch onto the default branch is initiated by invoking the git rebase command. The process automatically fetches the latest default branch updates and reapplies your current branch commits on top of the new base.

Do I need git installed to use automated rebase and conflict resolution?▼

Git is required to use automated rebase and conflict resolution. The automation acts as an intelligent layer over git, fetching the default branch, executing the rebase, and resolving merge conflicts based on contextual data from your PRs and issues.

Can I resolve merge conflicts automatically without manual intervention?▼

Merge conflicts can be resolved automatically without manual intervention when sufficient PR and issue context exists. The system intelligently applies resolutions for clear conflicts, but prompts the user for input when ambiguities prevent automatic decision-making.

Related Skills

Explore More Software Engineering Skills→
takemi-ohamatakemi-ohama

sync-main

Merge the latest default branch into the current working branch.

Community
Intermediate
cbleckercblecker
5

rebasing-branch

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

Community
Basic
DaleSeoDaleSeo
1

git-collaboration

Standardize Git PR workflows, merge strategies, and conflict resolution for teams.

Community
Advanced
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced