skills.rest
brave-experiments
brave-experimentsOFFICIAL
Explore all skills by this author →
GitHub

rebase-downstream

Rebases dependent Git branches in order after upstream changes with conflict resolution and preflight checks.

4|Updated Feb 2, 2026
Search Tags:#automation#git#dependency management#branching#code integration#rebase
One-click install
npx skills add https://github.com/brave-experiments/brave-core-bot --skill rebase-downstream
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-downstream
Source: https://github.com/brave-experiments/brave-core-bot/tree/main/.claude/skills/rebase-downstream
Command: npx skills add https://github.com/brave-experiments/brave-core-bot --skill rebase-downstream

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, including sibling branches, that depend on the current branch.
  • Ordered Rebasing: Rebases each detected branch sequentially onto its correct parent, maintaining the integrity of the dependency tree.
  • Conflict Resolution Assistance: Attempts to automatically resolve rebase conflicts and provides clear reporting when manual intervention is needed.
  • Preflight Checks: Executes comprehensive preflight checks (format, build, tests) on each rebased branch to guarantee stability.
  • Use Case: After merging a significant feature into a main development branch, this Skill can automatically rebase all feature branches that were branched off from it, and their subsequent dependent branches, ensuring everyone is up-to-date with minimal manual effort.

Quick Start

Run the rebase downstream skill to update all dependent branches after a recent merge.

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 dependent Git branches after merging upstream changes?▼

Automated branch detection identifies all downstream branches, including siblings, and sequentially rebases each branch onto its correct parent to propagate upstream changes. This maintains dependency tree integrity while reducing manual effort and merge conflicts.

What is the best way to handle merge conflicts when rebasing a tree of Git branches?▼

Conflict resolution assistance attempts to automatically resolve rebase conflicts during the ordered rebasing process, providing clear reporting when manual intervention is needed. This ensures code consistency across dependent branches without requiring full manual oversight.

Can I run preflight checks like formatting, builds, and tests on rebased Git branches?▼

Yes, preflight checks execute comprehensive format, build, and test validations on each rebased branch to guarantee stability. This ensures dependent branches remain functional and pass required checks after upstream code integration.

Does automated rebasing work with both linear branch chains and sibling branches?▼

Yes, the rebasing process handles both linear chains and trees with sibling branches. It detects downstream dependencies and rebases them in order onto their respective parents, maintaining correct structure for complex branch topologies.

When do I need to automate propagating changes through a Git branch chain?▼

You need automated branch propagation after merging a significant feature into a main development branch, ensuring all dependent feature branches and subsequent branches are updated with minimal manual effort. This prevents code drift across complex dependency trees.

Related Skills

Explore More Software Engineering Skills→
bmsull560bmsull560

jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Community
Intermediate
MetaMaskMetaMask
9

push

Push the current Git branch to the remote repository.

Official
Basic
brave-experimentsbrave-experiments
4

preflight

Run preflight checks for formatting, GN, presubmit, and build.

Official
Intermediate
aslakknutsenaslakknutsen

cherry-pick-backport

Backport upstream commits into downstream release branches with cherry-pick and conflict resolution.

Community
Advanced