skills.rest
JBonfim
JBonfimCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-rebase

Rebase feature branches onto origin/main with conflict analysis and validation.

Updated May 15, 2026
Search Tags:#git#merge conflicts#rebase#conflict resolution#linear history#force-with-lease#branch backup
One-click install
npx skills add https://github.com/JBonfim/skill-developer --skill git-rebase-jbonfim
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-rebase
Source: https://github.com/JBonfim/skill-developer/tree/main/.agents/skills/git-rebase
Command: npx skills add https://github.com/JBonfim/skill-developer --skill git-rebase-jbonfim

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill helps you handle Git rebase conflicts intelligently so you preserve your changes and arrive at a clean, linear history without repeatedly re-solving the same conflicts.

Core Features & Use Cases

  • Safety-first rebasing: Creates a backup (via bundled script or manual recovery options) to prevent losing work.
  • Conflict analysis & targeted resolution: Detects conflicted files, summarizes conflict markers, and guides you toward resolving them coherently.
  • Validation and testing guardrails: Checks for leftover conflict markers and unresolved conflicts, then encourages linting/testing before continuing and force-pushing safely.
  • Use case examples: Rebasing a feature branch onto main with multiple commits; resolving conflicts spanning several commits; addressing repeated conflicts using consistent resolution practices.

Quick Start

Use the git-rebase skill to rebase your feature branch onto the latest origin/main, resolve any conflicts once using the recommended strategy, then validate and force-push with --force-with-lease.

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 across multiple commits without repeating the same fixes?▼

You can resolve rebase conflicts once by creating a safety backup of your feature branch, selecting an appropriate rebase strategy, and using guided scripts to analyze and validate conflicts before continuing the rebase.

What is the best way to rebase a feature branch onto origin/main safely?▼

Safely rebasing a feature branch requires creating a backup first, then analyzing conflicted files and conflict markers, resolving them, and force-pushing with --force-with-lease to preserve remote history.

How do I validate that all conflict markers are removed before continuing a git rebase?▼

You validate conflict marker removal by running validation guardrails that check for leftover markers and unresolved conflicts, encouraging linting and testing before you continue the rebase and force-push safely.

Can I force-push a rebased branch without overwriting remote changes?▼

Yes, you can force-push safely by using the --force-with-lease flag after validating your conflicts and testing. This ensures you do not overwrite any new remote changes during the rebase push.

When do I need to create a backup before starting a git rebase?▼

You need to create a backup before starting a git rebase whenever your feature branch has multiple commits or complex conflicts, ensuring you can recover your work if the rebase strategy fails.

Related Skills

Explore More Software Engineering Skills→
flurdyflurdy
6

rebase-main

Rebase the current feature branch onto origin/main with conflict handling and status reporting.

Community
Intermediate
AbildtoftAbildtoft
2

kramme:rebase-pr

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

Community
Advanced
pedronauckpedronauck
567

git-rebase

Rebase Git branches onto main with conflict analysis and resolution strategies.

Community
Advanced
dsivovdsivov

git-workflow

Guide git branch creation, commits, merges, and conflict resolution.

Community
Advanced