rebase

Rebase a Git feature branch onto main with conflict handling and safe force-push.

1|Updated Oct 19, 2025

Search Tags:#automation #git #workflow #safety #rebase #branch-management #conflicts

Ready to run

npx skills add https://github.com/acartine/osterman --skill rebase-acartine

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: rebase
Source: https://github.com/acartine/osterman/tree/main/skills/rebase
Command: npx skills add https://github.com/acartine/osterman --skill rebase-acartine

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebase current work branches onto the latest main with intelligent conflict resolution to maintain a clean, up-to-date history without manual conflict handling.

Core Features & Use Cases

Automated rebase of the current feature branch onto main, preserving commits where possible.
Intelligent conflict resolution strategy with transparent reporting and abort options.
Safe push workflow using --force-with-lease and clear guidance for downstream checks.
Supports pre-merge workflows by ensuring the branch is up-to-date before creating a PR or merge.

Quick Start

Run the rebase skill on your current feature branch to rebase onto the latest main with safe, automatic conflict resolution.

Frequently Asked Questions about rebase

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I rebase a feature branch onto main without losing commits?▼

To rebase a feature branch safely, the skill automates rebasing your current work branch onto the latest main while preserving commits where possible. It handles conflicts intelligently and provides transparent reporting.

What is the safest way to force push a branch after a git rebase?▼

The safest way to force push after a rebase is using --force-with-lease. This skill enforces this safe push workflow to prevent overwriting downstream changes, providing clear guidance for subsequent checks.

How does intelligent conflict resolution work during a git rebase?▼

Intelligent conflict resolution during a rebase applies automated handling strategies to merge conflicts. If issues arise, the skill provides transparent conflict reporting and abort options to safely halt the process.

Can I run an automated rebase on my current branch before creating a pull request?▼

Yes, you can run this rebase skill to support pre-merge workflows. It ensures your feature branch is up-to-date with the latest main before you create a PR or attempt a merge.

Will this rebase skill modify or rewrite the main branch?▼

No, this rebase skill will not modify main. It strictly meets safety requirements by refusing to rebase main, focusing only on updating your current feature branch onto the latest main.