Is it safe to use this for force pushing?

Yes, the skill strictly recommends and uses the --force-with-lease flag to prevent accidentally overwriting changes pushed by other team members.

Does it work with specific project management tools?

It is highly optimized for Linear, automatically extracting ticket IDs from branch names to load relevant feature context for better decision-making.

Can I rebase multiple branches at once?

Yes, the batch workflow supports rebasing multiple MRs/PRs from GitHub or GitLab using the /lt-dev:git:rebase-mrs command.

How does this skill handle merge conflicts?

It utilizes project context and Linear ticket data to intelligently decide between incoming changes and feature changes, applying specific strategies for package files, models, and tests.

Branch Rebase Manager

Name: Branch Rebase Manager
Author: lenneTech

bylenneTech

0•

开发者工具

Streamlines Git rebase workflows by automating branch updates, resolving conflicts with ticket context, and managing batch merge request updates.

The Branch Rebase Manager skill provides a comprehensive framework for updating feature branches against development branches like 'dev' or 'main'. It intelligently detects base branches, extracts Linear ticket context to inform conflict resolution, and automates the rebase process for single branches or batch operations across multiple Merge Requests. Beyond simple Git commands, it incorporates post-rebase optimizations, automated linting with oxfmt and oxlint, and ensures safety with force-with-lease pushes, making it an essential tool for maintaining clean project histories and up-to-date feature branches.

主要功能

01Integrated linting and formatting using oxfmt and oxlint

02Batch rebase capabilities for multiple Merge Requests (MRs/PRs)

030 GitHub stars

04Linear ticket extraction and context-aware conflict resolution

05Automated base branch detection (dev/develop/main)

06Post-rebase code optimization and redundancy checks

使用场景

01Updating multiple open pull requests simultaneously before a release or team review

02Resolving complex merge conflicts using Linear issue descriptions for context

03Syncing a long-running feature branch with the latest changes in the development branch

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add lennetech/claude-code rebasing-branches

For use in Claude.ai and ChatGPT

Download Skill