skills.rest
prestomation
prestomationCOMMUNITY
Explore all skills by this author →
GitHub

upstream-feature-sync

Group upstream engine changes into per-feature diffs with merge, skip, or defer decisions.

5|Updated May 7, 2024
Search Tags:#automation#git#diff#code-review#pull-request#upstream#feature-sync
One-click install
npx skills add https://github.com/prestomation/206events --skill upstream-feature-sync
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: upstream-feature-sync
Source: https://github.com/prestomation/206events/tree/main/skills/upstream-feature-sync
Command: npx skills add https://github.com/prestomation/206events --skill upstream-feature-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This capability identifies upstream engine changes that are not yet present in a city copy and prepares a structured review workflow to describe, evaluate, and stage them as per-feature draft PRs, ensuring the owner remains in control and no automatic merges occur.

Core Features & Use Cases

  • Group upstream changes into named features by diffing against upstream/main and organizing them into logical units.
  • Present per-feature decisions (merge / skip / defer) and track outcomes in a lightweight ledger (feature-sync.json).
  • Stage just the chosen features into draft PRs, preserving the city’s customisations and history.
  • Never run on the reference instance or perform automatic upstream merges.

Quick Start

Run the npm script to surface upstream changes, review per-feature options, and prepare draft PRs.

Frequently Asked Questions about upstream-feature-sync

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

FAQPage Schema
How do I identify upstream changes not yet present in my local copy?▼

To identify upstream changes, this Skill diffs your local copy against upstream/main, groups the changes into named features, and summarizes them for review. It scopes the differences into logical units to prepare a structured evaluation workflow.

How do I prepare draft pull requests for upstream feature sync?▼

To prepare draft pull requests for upstream feature sync, you review the per-feature options and select merge, skip, or defer. The Skill stages only your chosen features into draft PRs while preserving your local customizations and history.

How does the feature review process track merge and skip decisions?▼

The feature review process tracks merge and skip decisions using a lightweight ledger file named feature-sync.json. This file records your owner-driven decisions for each feature, ensuring you maintain full control over the synchronization outcomes.

Does this upstream merge tool perform automatic merges into the main branch?▼

No, this upstream merge tool never performs automatic merges into the main branch. It enforces manual merges by only staging your selected features into draft PRs, ensuring the owner remains in control of all integrations.

What is the best way to review upstream engine changes without losing local customizations?▼

The best way to review upstream engine changes without losing local customizations is to group changes into per-feature diffs. This Skill stages only chosen features into draft PRs, preserving your local history and modifications during the merge.

Related Skills

Explore More Software Engineering Skills→
infinitegameplayerinfinitegameplayer
2

sovereign-sync

Review and apply upstream framework updates to a local Sovereign Ecosystem vault.

Community
Intermediate
ReinaMacCredyReinaMacCredy
223

finishing-a-development-branch

Verify tests and present merge, PR, or cleanup options for a development branch.

Community
Advanced
hamzaPixlhamzaPixl
2

cartographer

Analyze pull request diffs and group code changes into semantic feature clusters.

Community
Advanced
ArogyaReddyArogyaReddy

git-advanced-workflows

Teach interactive rebase, cherry-pick, bisect, worktrees, and reflog workflows.

Community
Advanced