upstream

Merges upstream template changes into branded forks while preserving branding via brand.json.

Updated Feb 7, 2026
One-click install
npx skills add https://github.com/pward17/site-template --skill upstream
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: upstream
Source: https://github.com/pward17/site-template/tree/main/.claude/skills/upstream
Command: npx skills add https://github.com/pward17/site-template --skill upstream

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Syncs upstream template changes into your branded fork while preserving branding and minimizing manual merge work.

Core Features & Use Cases

  • Conflict-aware merge of upstream changes with branding protection
  • Branded-file preservation using .claude/brand.json
  • Remote management, change previews, and automatic restoration of branded files

Quick Start

Run the /upstream sync command to fetch the latest upstream changes and merge them into your fork while preserving branded files.

Frequently Asked Questions about upstream

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

FAQPage Schema
How do I merge upstream changes into a fork without losing branding?

To merge upstream changes without losing branding, you need a conflict-aware workflow that protects branded files. This Skill performs a no-commit merge, automatically restores files listed in brand.json, and regenerates lockfiles to ensure your custom branding survives the template upgrade.

What is the best way to sync a template repo fork with upstream git changes?

The best way to sync a template repo fork with upstream git changes is to use a branded-file protection mechanism. This tool fetches upstream updates, applies a no-commit merge to preview changes, and automatically restores branding defined in your configuration file.

How does brand.json protect files during a git merge?

The brand.json file protects files during a git merge by defining branding-sensitive paths. After the upstream merge is applied without committing, the tool reads this configuration to automatically restore your branded files, preventing upstream template changes from overwriting your customizations.

Can I preview upstream changes before committing them to my fork?

Yes, you can preview upstream changes before committing them to your fork. The tool performs a no-commit merge, allowing you to review the applied template updates and verify that branding-sensitive files are correctly restored before finalizing the sync.

Do I need to manually resolve conflicts when upgrading a branded fork?

You do not need to manually resolve conflicts for branding-sensitive files when upgrading a branded fork. The tool minimizes manual merge work by using brand.json to automatically restore your custom files and regenerating lockfiles as part of the upgrade workflow.

Why are my lockfiles modified after syncing upstream template changes?

Your lockfiles are modified after syncing upstream template changes because the upgrade workflow automatically regenerates them. This ensures your dependency tree remains consistent with the newly merged upstream code while keeping your branded files protected.