rebase-advisor

Detect multi-branch release scenarios and propose a guided rebase workflow.

3|Updated Mar 30, 2026
One-click install
npx skills add https://github.com/DojoCodingLabs/make-no-mistakes-toolkit --skill rebase-advisor
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: rebase-advisor
Source: https://github.com/DojoCodingLabs/make-no-mistakes-toolkit/tree/main/skills/rebase-advisor
Command: npx skills add https://github.com/DojoCodingLabs/make-no-mistakes-toolkit --skill rebase-advisor

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Detects when a team needs to synchronize multiple branches after a release and provides guidance to run a team-wide rebase workflow.

Core Features & Use Cases

  • Advises on coordinating multi-branch rebases across the development team
  • Suggests the canonical command to initiate the process: /make-no-mistakes:rebase {repo-name}
  • Helps ensure branches are rebased onto updated develop/main and PRs are auto-merged when CI is green

Quick Start

Describe a multi-branch release scenario to trigger the team-wide rebase guidance

Frequently Asked Questions about rebase-advisor

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

FAQPage Schema
How do I coordinate a team-wide git rebase across multiple branches after a release?

To coordinate a team-wide git rebase after a release, you need a guided workflow that syncs remote changes, stashes local work, rebases branches onto updated develop/main, and auto-merges PRs when CI passes. This ensures all team branches stay aligned with the latest release state.

When do I need to run a multi-branch rebase using git worktrees?

A multi-branch rebase is needed when your develop or main branch falls behind after a release, and multiple worktrees hold unmerged changes. This scenario requires synchronizing all active branches to prevent integration conflicts and ensure consolidated PRs merge cleanly.

What is the best way to automate branch management and PR consolidation after rebasing?

Automating branch management after rebasing requires an end-to-end protocol that performs remote syncs, rebases all active branches, and auto-merges PRs when CI is green. This workflow concludes with post-merge checks and health reporting to verify branch synchronization.

Does the guided rebase workflow handle stashing changes and post-merge health reporting?

Yes, the guided rebase workflow handles stashing changes before rebasing and generates post-merge health reporting. It covers the full end-to-end protocol including remote sync, rebasing all branches, auto-merges, and validation checks to ensure team-wide branch synchronization.

How do I start a team sync rebase for a specific repository?

To start a team sync rebase for a specific repository, describe your multi-branch release scenario to trigger the guided workflow, then initiate the process with the canonical command format /make-no-mistakes:rebase {repo-name} to begin syncing branches across your team.