skills.rest
ESO-Toolkit
ESO-ToolkitOFFICIAL
Explore all skills by this author →
GitHub

rebase-conflicts

Guide Git rebase conflict resolution with safe commands and recovery steps.

2|Updated Aug 18, 2025
Search Tags:#git#developer tools#version control#branch management#merge conflicts#rebase
One-click install
npx skills add https://github.com/ESO-Toolkit/eso-toolkit --skill rebase-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-conflicts
Source: https://github.com/ESO-Toolkit/eso-toolkit/tree/main/.github/skills/rebase-conflicts
Command: npx skills add https://github.com/ESO-Toolkit/eso-toolkit --skill rebase-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill guides users through the complex process of rebasing Git branches, resolving merge conflicts, and recovering from failed rebase operations, ensuring a smooth and efficient development workflow.

Core Features & Use Cases

  • Step-by-step conflict resolution: Handles simple to complex merge conflicts, including generated file and interactive rebase scenarios.
  • Safe rebasing practices: Emphasizes using git worktree list and git push --force-with-lease for safety.
  • Agent-safe commands: Provides methods to prevent Git from blocking in automated environments.
  • Use Case: A developer's branch is significantly behind main, and git rebase main results in dozens of conflicts across multiple files. This Skill provides a structured approach to resolve each conflict systematically and safely push the updated branch.

Quick Start

Use the rebase-conflicts skill to rebase your current branch onto origin/main and resolve any merge conflicts that arise.

Frequently Asked Questions about rebase-conflicts

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

FAQPage Schema
How do I resolve merge conflicts during a Git rebase onto another branch?▼

Resolve merge conflicts during a Git rebase by systematically editing files, staging changes, and continuing. This Skill guides conflict resolution for efficient branch updates.

What is the safest way to force push a branch after rebasing?▼

The safest way to force push after rebasing is using git push --force-with-lease. This prevents overwriting remote changes, ensuring secure branch management during conflict resolution.

How do I recover from a failed Git rebase operation?▼

Recover from a failed Git rebase by aborting the operation or resetting the branch. This Skill provides structured methods to handle complex conflict scenarios and restore workflow state.

Can I handle interactive rebase scenarios when merge conflicts arise?▼

Yes, interactive rebase scenarios with merge conflicts are supported. The Skill addresses complex conflict resolution across multiple files, including generated files and interactive operations.

How do I prevent Git commands from blocking in automated environments?▼

Prevent Git commands from blocking in automated environments by using agent-safe commands. This Skill provides specific methods to ensure Git operations complete without hanging during rebase.

What should I do if git rebase main results in dozens of conflicts across files?▼

If git rebase main results in dozens of conflicts, use a structured approach to resolve each conflict systematically. This ensures safe and efficient branch updates even with complex scenarios.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
jcdendritejcdendrite
4

git-feature-branch-sync

Synchronize a divergent Git feature branch with the remote default branch.

Community
Advanced
sasamukusasamuku
8

fixup-commit

Create fixup commits and run autosquash rebase on a target branch.

Community
Basic
jMertajMerta
130

rebase-assistant

Rebase the current branch onto a target branch with conflict triage guidance.

Community
Intermediate