skills.rest
leejaedus
leejaedusCOMMUNITY
Explore all skills by this author →
GitHub

upstream-sync

syncs Git repositories by automating selective updates of tracked files from upstream to downstream branches, preserving compatibility with Pepcode's naming conventions and avoiding duplication of identical content across repositories.

Updated Feb 15, 2026
Search Tags:#automation#git#workflow#merge#diff#conflict-resolution#upstream-sync
One-click install
npx skills add https://github.com/leejaedus/pepcode --skill upstream-sync
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: upstream-sync
Source: https://github.com/leejaedus/pepcode/tree/main/skills/upstream-sync
Command: npx skills add https://github.com/leejaedus/pepcode --skill upstream-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Fetch, analyze, and selectively apply upstream changes from the oh-my-claudecode repository to pepcode, reducing manual conflict-prone syncing.

Core Features & Use Cases

  • Analyze changes since the last sync to identify what needs review.
  • Classify changes into Core, Skills, Agents, Config, Docs, Tests, and Build for targeted application.
  • Offer interactive or automated workflows to apply changes by category or file, with 3-way merge when conflicts occur.
  • Update the local worktree with a sync marker and automatically apply rename mappings from oh-my-claudecode to pepcode.

Quick Start

Run /pepcode:upstream-sync to fetch changes, review diffs, and selectively apply updates from upstream.

Frequently Asked Questions about upstream-sync

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

FAQPage Schema
How do I selectively apply upstream changes to a downstream Git worktree?▼

Upstream sync fetches and analyzes changes from a remote repository, then categorizes them into Core, Skills, Agents, Config, Docs, Tests, and Build to support selective updates in downstream worktrees. You can review diffs and apply changes by category or file interactively.

How does 3-way merge handle conflict resolution during upstream sync?▼

3-way merge during upstream sync resolves conflicts by comparing the upstream changes, your local downstream branch, and the common base commit. This mechanism supports both manual and automated application workflows to safely integrate conflicting file modifications.

Do I need a specific remote configuration to sync upstream changes?▼

Yes, upstream sync requires a configured Git remote named upstream and a default main branch. These prerequisites allow the tool to fetch repository changes, analyze the diff since the last sync, and apply rename mappings automatically.

What is the best way to automate syncing upstream Git changes without manual conflict review?▼

Upstream sync offers automated workflows to apply changes by category or file after fetching and analyzing the diff. It automatically applies rename mappings and updates the local worktree with a sync marker, reducing manual conflict-prone merging.

Can I classify upstream repository changes by scope before applying them?▼

Yes, upstream sync analyzes the scope of changes since the last sync and classifies them into categories like Core, Skills, Agents, Config, Docs, Tests, and Build. This categorization supports targeted application to your downstream worktree.

Why are upstream merges not working when syncing changes to my downstream repository?▼

Upstream merges may fail if the required upstream remote is not configured or the default main branch is missing. Ensure your environment has the correct remote setup so the tool can fetch changes, analyze diffs, and perform the 3-way merge properly.

Related Skills

Explore More Software Engineering Skills→
adamfilliadamfilli
11

rebase

Rebase the current Git branch onto the latest origin/main branch.

Community
Intermediate
jboothomasjboothomas
1

update-skills

Fetch upstream skill branches, merge updates, and resolve conflicts.

Community
Advanced
shonenmshonenm
2

conflict-resolve

Resolve Git merge and rebase conflicts by analyzing base, ours, and theirs states.

Community
Advanced
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced