skills.rest
zoraxl
zoraxlCOMMUNITY
Explore all skills by this author →
GitHub

rebase-onto-main

Rebase local feature branches onto the default base branch with conflict resolution and audit reports.

3|Updated Apr 27, 2026
Search Tags:#automation#git#version control#audit#rebase#conflict resolution
One-click install
npx skills add https://github.com/zoraxl/team-brain --skill rebase-onto-main
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-onto-main
Source: https://github.com/zoraxl/team-brain/tree/main/.cursor/skills/rebase-onto-main
Command: npx skills add https://github.com/zoraxl/team-brain --skill rebase-onto-main

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill eliminates the anxiety and manual overhead of rebasing feature branches by providing a structured, step-by-step workflow that handles conflict resolution with AI judgment and generates a formal audit trail.

Core Features & Use Cases

  • Conflict-by-Conflict Judgment: Automatically distinguishes between trivial formatting conflicts and complex logic changes that require human input.
  • Safety Guardrails: Enforces strict git practices, preventing accidental force-pushes and ensuring the working tree is clean before operations begin.
  • Audit Reporting: Automatically generates a markdown report in the audit folder detailing the rebase history, conflict resolutions, and final build status.

Quick Start

Ask the agent to rebase the current feature branch onto the main branch and generate an audit report.

Frequently Asked Questions about rebase-onto-main

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

FAQPage Schema
How do I safely rebase a feature branch onto main without losing commit history?▼

To safely rebase a feature branch, the skill enforces strict git safety guardrails, preventing accidental force-pushes and verifying the working tree is clean before synchronizing your commit history with the default base branch.

How does AI-guided git conflict resolution handle complex logic changes versus trivial formatting?▼

AI-guided conflict resolution automatically distinguishes between trivial formatting conflicts, which it resolves independently, and complex logic changes that require human input, ensuring accurate conflict resolution during branch rebasing.

Can I automatically generate an audit trail for git rebase operations and conflict resolutions?▼

Yes, you can generate an audit trail for git rebase operations. The skill automatically produces a markdown report in the audit folder detailing the complete rebase history, conflict resolutions, and final build status.

Do I need git CLI access to automate feature branch rebasing and history synchronization?▼

Yes, you need git CLI access to automate feature branch rebasing. The skill requires direct command-line interface interaction to execute branch manipulation and adhere to defined safety protocols for history preservation.

What's the best way to prevent accidental force-pushes when rebasing local feature branches?▼

The best way to prevent accidental force-pushes during rebasing is using built-in safety guardrails. The skill enforces strict git practices to protect your working tree and ensure clean commit histories before operations begin.

Related Skills

Explore More Software Engineering Skills→
ahandselahandsel
1

git-pull-main

Synchronizes local Git feature branches with the remote main branch.

Community
Intermediate
SocketDevSocketDev
125

refreshing-history

Consolidate repository histories into a single signed initial commit.

Official
Advanced
RyoMurakami1983RyoMurakami1983
2

git-initial-setup

Automates GitLab project and repository setup for streamlined onboarding and management.

Community
Intermediate
rafaelromaorafaelromao
5

sandman-back-merge

Merge a base branch into the current branch without rewriting history.

Community
Advanced