rebase-downstream

Rebase dependent branches in order after upstream changes.

3.5k|1.4k|Updated Nov 10, 2017
One-click install
npx skills add https://github.com/brave/brave-core --skill rebase-downstream-brave
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: rebase-downstream
Source: https://github.com/brave/brave-core/tree/main/.claude/skills/rebase-downstream
Command: npx skills add https://github.com/brave/brave-core --skill rebase-downstream-brave

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill automates the complex and error-prone process of updating multiple dependent branches after upstream changes, ensuring code consistency and reducing merge conflicts.

Core Features & Use Cases

  • Automated Branch Detection: Intelligently identifies all downstream branches that depend on the current branch.
  • Ordered Rebasing: Rebases branches sequentially, starting from the closest downstream dependency.
  • Conflict Resolution Assistance: Provides guidance and attempts to resolve merge conflicts automatically.
  • Preflight Checks: Runs automated checks (build, tests, etc.) on each rebased branch to ensure stability.
  • Use Case: After updating a core library branch, use this Skill to automatically rebase all feature branches that depend on it, preventing integration headaches.

Quick Start

Propagate the latest changes from the current branch to all downstream dependent branches.

Frequently Asked Questions about rebase-downstream

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

FAQPage Schema
How do I rebase multiple downstream branches automatically after upstream changes?

You can automate a rebase of downstream branches by detecting dependent branches and rebasing them sequentially. This skill handles ordered rebasing, conflict resolution assistance, and preflight checks to ensure code consistency across the branch tree.

What is the best way to propagate updates from a core library branch to dependent feature branches?

Propagating updates to dependent feature branches requires an ordered rebase starting from the closest downstream dependency. This automated workflow detects the dependent tree, resolves conflicts, and runs checks to prevent integration headaches.

Does automated branch rebasing work on trees with sibling branches or only linear chains?

Automated branch rebasing handles both linear chains and trees with sibling branches. It intelligently detects all downstream dependencies and rebases each branch in order, maintaining stability across complex branch topologies.

How do merge conflicts get resolved when rebasing a tree of dependent branches?

When rebasing a tree of dependent branches, the workflow provides conflict resolution assistance and attempts to resolve merge conflicts automatically. This reduces manual errors during continuous integration and code integration.

What preflight checks are run during an automated downstream rebase?

During an automated downstream rebase, preflight checks run automated build and test validations on each branch. This ensures stability and code consistency before the rebase process moves to the next downstream dependency.

When should I avoid automating a downstream rebase workflow?

You should avoid automating a downstream rebase if your branches lack clear dependency mappings or if preflight checks fail, as unresolved merge conflicts can disrupt the ordered rebasing process across the tree.