How does Stylish Git Rebase handle lockfile conflicts?

The skill automatically detects the package manager (npm, yarn, or pnpm), accepts the incoming changes, and runs the appropriate install command to regenerate a valid lockfile.

Is it safe to use force-push with this skill?

Yes, the skill uses --force-with-lease instead of a standard force-push, ensuring you do not overwrite others' work if the remote branch has changed unexpectedly.

What happens if a code conflict is too complex for the AI?

For complex logic conflicts or ambiguous changes, the skill will present the conflicting versions to the user and request manual input to ensure code integrity.

Can I use this on my main or production branches?

No, the skill includes built-in safety features that block rebase operations on protected branches like main, master, and develop to prevent accidental history rewrites.

Stylish Git Rebase

Name: Stylish Git Rebase
Author: StyleList94

byStyleList94

0•

Developer Tools

Streamlines Git rebasing by intelligently resolving merge conflicts and managing safe force-pushes to feature branches.

Stylish Git Rebase is a specialized Claude Code skill designed to automate and simplify the complex process of rebasing feature branches onto main or master branches. It enhances the developer experience by providing intelligent conflict resolution for both package lockfiles (npm, yarn, pnpm) and source code, while incorporating essential safety features like protected branch detection and force-with-lease pushing to prevent data loss. This tool is ideal for developers looking to maintain a clean git history and resolve repetitive merge conflicts without manual intervention.

Key Features

01Intelligent conflict resolution for package lockfiles (npm, yarn, pnpm)

020 GitHub stars

03Automatic base branch detection and fetching from remote origins

04Safe synchronization with remote repositories using force-with-lease

05Safety checks to prevent accidental rebasing on protected branches (main, master, develop)

06Automated smart merging for common code conflicts like imports and duplicate lines

Use Cases

01Updating a feature branch with the latest changes from the main branch before merging

02Cleaning up commit history via rebase while ensuring remote branch safety

03Resolving tedious lockfile conflicts automatically after a teammate updates dependencies

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add stylelist94/claude-plugins rebase

For use in Claude.ai and ChatGPT

Download Skill