skills.rest
florian-trehaut
florian-trehautCOMMUNITY
Explore all skills by this author →
GitHub

bmad-upstream-sync

Reconcile upstream BMAD-METHOD changes in a fork while preserving fork conventions.

Updated Aug 23, 2026
Search Tags:#git#workflow#auditing#merge#conflicts#upstream#fork
One-click install
npx skills add https://github.com/florian-trehaut/bmad-global --skill bmad-upstream-sync
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: bmad-upstream-sync
Source: https://github.com/florian-trehaut/bmad-global/tree/main/.claude/skills/bmad-upstream-sync
Command: npx skills add https://github.com/florian-trehaut/bmad-global --skill bmad-upstream-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Keeps a fork in sync with upstream BMAD-METHOD while preserving fork-specific structure, rules, and identities, avoiding unsafe overwrites and lost fork enhancements.

Core Features & Use Cases

  • Fork-aware analysis of upstream commits to classify impact and plan merges without breaking fork conventions.
  • Guided conflict resolution that preserves fork identity and integrates upstream improvements where appropriate.
  • Structured review & verification with downstream steps (import checks, ADR awareness, and quality gates) to ensure a clean history.

Quick Start

Install or run the upstream sync skill to start analyzing divergence and prepare the merge plan.

Frequently Asked Questions about bmad-upstream-sync

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

FAQPage Schema
How do I sync a fork with upstream changes without losing custom modifications?▼

Fork-aware upstream sync analyzes upstream commits and reconciles changes through guided conflict resolution, preserving your fork's structure and identity while integrating improvements.

What is the best way to resolve merge conflicts when pulling upstream commits into a forked project?▼

Guided conflict resolution evaluates upstream commits against fork conventions, classifies impact, and applies structural adaptation to guarantee a clean, auditable merge.

How does fork-aware analysis work when integrating upstream changes?▼

Fork-aware analysis inspects upstream commits to classify their impact and plan merges without breaking fork conventions, ensuring structural adaptation and content integration are auditable.

How do I audit an upstream merge to ensure it retains fork identity?▼

You audit an upstream merge through a stepwise workflow with import checks, ADR awareness, and quality gates that verify fork identity and produce a clean history.

Can I use this upstream sync workflow for any forked git repository?▼

This workflow applies specifically to forked projects where upstream introduces commits requiring structural adaptation, content integration, and guided conflict resolution.

Why does merging upstream changes overwrite my fork-specific rules and structure?▼

Unsafe overwrites happen without fork-aware analysis; applying a stepwise workflow with import review and verification prevents lost fork enhancements and retains identity.

Related Skills

Explore More Software Engineering Skills→
coco-decoco-de

BMad Master

Orchestrate BMAD Method workflows across agents with phase governance.

Official
Advanced
nickcuypersnickcuypers

flutter-deps-upgrade

Automate Flutter dependency upgrades with verification gates and migration-aware reporting.

Community
Intermediate
CuriousLearnerCuriousLearner
27

conflict-resolver

Analyze Git merge conflict types and propose automated or manual resolution strategies.

Community
Advanced
sluongngsluongng
6

buck2-stack-maintainer

Rebase fork/stack onto origin/main and publish merge commits to fork/main.

Community
Advanced