Does this skill handle both main and master branches?

Yes, the skill automatically detects whether your repository uses 'main' or 'master' as the default branch name.

What happens if a conflict is too complex?

If a resolution is ambiguous, the skill will explain the choices it made in the final report and can be prompted for further adjustments.

Is it safe to use force-push?

The skill uses the '--force-with-lease' flag, which is a safer alternative to '--force' as it prevents overwriting remote work that you haven't fetched yet.

How does it resolve merge conflicts?

It analyzes the context of the conflicting code blocks and attempts to merge them logically, preferring to keep functionality from both sides when possible.

Rebase on Main

Name: Rebase on Main
Author: doodledood

bydoodledood

•

Developer Tools

Automates the entire Git rebase workflow from fetching remote changes to resolving conflicts and force-pushing safely.

This Claude Code skill streamlines the process of keeping feature branches up-to-date with the primary branch (main or master). It handles the tedious manual steps of fetching origin, updating local tracks, rebasing the current branch, and intelligently resolving merge conflicts by analyzing code context. By using safety-first commands like force-with-lease, it ensures a clean commit history without risking unintentional data loss, making it an essential tool for maintaining high-velocity development workflows and a linear Git history.

Key Features

01Intelligent AI-powered conflict resolution with context analysis

02Post-rebase summaries detailing commits and resolved conflicts

03Automatic main/master branch detection and synchronization

04Complete automation of the fetch-checkout-pull-rebase cycle

058 GitHub stars

06Safe remote updates using git push --force-with-lease

Use Cases

01Cleaning up local commit history to maintain a linear project timeline

02Resolving complex merge conflicts before submitting a Pull Request

03Keeping a long-running feature branch synced with the latest main changes

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add doodledood/claude-code-plugins rebase-on-main

For use in Claude.ai and ChatGPT

Key Features

01Intelligent AI-powered conflict resolution with context analysis

02Post-rebase summaries detailing commits and resolved conflicts

03Automatic main/master branch detection and synchronization

04Complete automation of the fetch-checkout-pull-rebase cycle

058 GitHub stars

06Safe remote updates using git push --force-with-lease

Use Cases

01Cleaning up local commit history to maintain a linear project timeline

02Resolving complex merge conflicts before submitting a Pull Request

03Keeping a long-running feature branch synced with the latest main changes

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add doodledood/claude-code-plugins rebase-on-main

For use in Claude.ai and ChatGPT