Skills
.Work. You
Rest

auto-rebase

Community

Keep PRs up-to-date with force-push

Software Engineering#git#workflow#pull request#rebase#conflict resolution#force-push
Authorbaphled
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill automates the process of rebasing feature branches onto their target branch, resolving conflicts, and force-pushing to keep Pull Requests current, ensuring a clean and linear Git history.

Core Features & Use Cases

  • Automated Rebasing: Rebase feature branches onto a specified target branch (e.g., next).
  • Conflict Resolution Guidance: Provides steps for manual conflict resolution if needed.
  • Safe Force-Pushing: Uses git push --force-with-lease to prevent accidental overwrites.
  • Worktree Aware: Handles rebasing correctly in multi-worktree setups.
  • Use Case: When your feature branch is falling behind the main development branch and you need to update it before merging, this skill will automatically fetch the latest changes, rebase your branch, and prepare it for a safe force-push.

Quick Start

Use the auto-rebase skill to rebase the current branch onto origin/next and then force-push with lease.

Dependency Matrix

Required Modules

None required

Components

references

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: auto-rebase
Download link: https://github.com/baphled/dotopencode/archive/main.zip#auto-rebase

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.