Skills
.Work. You
Rest

rebase

Community

Safely rebase and push your branch.

Software Engineering#git#developer tools#version control#branching#rebase#conflict resolution
AuthorApostolos-Delis
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps you integrate changes from the main branch into your current feature branch by rebasing, resolving any conflicts that arise, and pushing the updated branch safely.

Core Features & Use Cases

  • Conflict Resolution: Guides you through resolving merge conflicts during a rebase.
  • Safe Pushing: Uses --force-with-lease to prevent accidental overwrites of others' work.
  • Pre-flight Checks: Ensures you're in a Git repository, not on the main branch, and have a clean working tree before starting.
  • Use Case: You've been working on a feature for a while, and main has moved ahead. Use this Skill to bring your branch up-to-date with main without creating a merge commit, keeping your history linear.

Quick Start

Use the rebase skill to rebase the current branch onto origin/main and resolve any conflicts.

Dependency Matrix

Required Modules

None required

Components

scriptsreferences

💻 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: rebase
Download link: https://github.com/Apostolos-Delis/Dotfiles/archive/main.zip#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.