rebase-conflicts

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.