skills.rest
kagenti
kagentiOFFICIAL
Explore all skills by this author →
GitHub

git:rebase

Rebase the current Git branch onto the upstream main branch.

292|103|Updated Mar 27, 2025
Search Tags:#git#workflow#development#version control#branching#rebase
One-click install
npx skills add https://github.com/kagenti/kagenti --skill git-rebase-kagenti
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git:rebase
Source: https://github.com/kagenti/kagenti/tree/main/.claude/skills/git%3Arebase
Command: npx skills add https://github.com/kagenti/kagenti --skill git-rebase-kagenti

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill streamlines the process of updating your local feature branch with the latest changes from the upstream main branch, ensuring a clean and conflict-free history before merging.

Core Features & Use Cases

  • Automatic Base Detection: Intelligently identifies the correct upstream remote and main branch for rebasing.
  • Conflict Resolution Guidance: Provides clear steps for handling and resolving merge conflicts during the rebase process.
  • Commit Signing: Ensures all commits are signed after rebasing, a requirement for certain workflows.
  • Use Case: Before submitting a Pull Request, use this Skill to rebase your feature branch onto the latest upstream/main to resolve any divergence and ensure your changes integrate smoothly.

Quick Start

Rebase the current branch onto the upstream main branch using the automatic detection alias.

Frequently Asked Questions about git:rebase

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

FAQPage Schema
How do I rebase my current Git branch onto the upstream main branch?▼

To rebase a Git branch onto upstream main, this Skill automatically detects the correct remote and main branch name, then replays your local commits on top of the latest upstream changes to ensure a clean, conflict-free history before merging.

What's the best way to resolve merge conflicts during a Git rebase?▼

During a Git rebase, this Skill provides clear procedural guidance for handling and resolving merge conflicts, ensuring your local feature branch integrates smoothly with the upstream main branch without losing commit history.

When do I need to rebase a feature branch before merging?▼

You need to rebase a feature branch before submitting a Pull Request to resolve branch divergence, update your local commits with the latest upstream main changes, and ensure all commits are properly signed for workflow compliance.

Does this Git rebase workflow require manual remote and branch detection?▼

No, this Git rebase workflow features automatic base detection that intelligently identifies the correct upstream remote and main branch name, eliminating the need for manual remote configuration before replaying commits.

Are signed commits enforced when rebasing onto upstream main?▼

Yes, commit signing is enforced after rebasing onto upstream main, ensuring all replayed commits meet the signing requirements of your version control workflow before you create a pull request.

Related Skills

Explore More Software Engineering Skills→
bswrundquistbswrundquist

push

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

Community
Intermediate
RobbyMo81RobbyMo81

prepare-pr

Rebase GitHub pull requests onto main, fix review findings, and run build gates.

Community
Advanced
willietranwillietran
3

merge

Squash-merge successful session worktrees into the feature branch sequentially.

Community
Intermediate
WesleyMFrederickWesleyMFrederick

merging-feature-branches-to-main

Squashes Git feature-branch history into a single commit when merging to main.

Community
Basic