skills.rest
stickerdaniel
stickerdanielCOMMUNITY
Explore all skills by this author →
GitHub

upstream-sync

Automate synchronization and review of changes between a template repository and a fork.

49|12|Updated Aug 18, 2025
Search Tags:#git#code review#template synchronization#merge review#fork management
One-click install
npx skills add https://github.com/stickerdaniel/saas-starter --skill upstream-sync-stickerdaniel
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: upstream-sync
Source: https://github.com/stickerdaniel/saas-starter/tree/main/skills/upstream-sync
Command: npx skills add https://github.com/stickerdaniel/saas-starter --skill upstream-sync-stickerdaniel

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires bash, git, and includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill streamlines the process of synchronizing changes from a template repository to a fork, allowing for efficient review and integration of updates.

Core Features & Use Cases

  • Fork Point Detection: Automatically identifies the point at which the fork was created.
  • Change Listing: Provides a comprehensive list of upstream commits since the last sync.
  • Commit Review and Classification: Guides through the review process, classifying commits as integrable, present, or excluded, and handles dependencies.
  • Consolidated Pull Request: Ships a single, integrated pull request with all necessary changes.
  • Use Case: When maintaining a fork of the 'saas-starter' template, use this Skill to pull in and review updates from the upstream repository.

Quick Start

Run the command to find the fork point and list changes:

bun skills/upstream-sync/scripts/find-fork-point.ts
bun skills/upstream-sync/scripts/list-upstream-changes.ts

Frequently Asked Questions about upstream-sync

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

FAQPage Schema
How do I synchronize changes from a template repository to a fork?▼

Template synchronization automates pulling upstream commits into your fork. This process automatically finds the fork point, lists upstream changes, and helps classify commits for integration.

What is the best way to review and classify upstream commits before merging?▼

Merge review classifies upstream commits as integrable, present, or excluded. This ensures you only pull necessary changes from the template repository while handling dependencies correctly.

How do I find the fork point of a template repository to start tracking changes?▼

Fork point detection automatically identifies where your fork diverged from the template repository. Running the find-fork-point script outputs the baseline needed to list subsequent upstream changes.

Can I consolidate multiple upstream commits into a single pull request?▼

Yes, template synchronization ships a single consolidated pull request. After reviewing and classifying commits, it integrates all necessary changes into one PR for consistent upstream alignment.

What are the limitations of automating fork management for template repositories?▼

Automated fork management requires specific script dependencies and cannot resolve merge conflicts automatically. You must manually classify complex commits and handle dependency exclusions during the review process.

How do I find the fork point of a template repository to start tracking changes?▼

Fork point detection automatically identifies where your fork diverged from the template repository. Running the find-fork-point script outputs the baseline needed to list subsequent upstream changes.

Related Skills

Explore More Software Engineering Skills→
sdk451sdk451

speckit-git-initialize

Initialize a Git repository with an initial commit in Bash or PowerShell.

Community
Intermediate
PalbahngmiyinePalbahngmiyine

fork-pr

Create pull requests from forked repositories to upstream using gh CLI.

Community
Intermediate
a-taka-tak
1

git-commit-push

Automates staging, committing, and pushing with standardized Git workflow.

Community
Basic
chiptoe-svgchiptoe-svg

update-nanoclaw

Merge upstream NanoClaw updates into customized installs with git workflows.

Community
Advanced