Skip to content

v1.0.1 — Upstream Sync Skill for Claude Code

Choose a tag to compare

View all tags
@dris1153 dris1153 released this 29 Mar 03:43
· 9 commits to main since this release
v1.0.1
0f8f34e
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode.

What's New

A Claude Code agent skill that automates syncing forked/cloned open source repositories with upstream changes.

Core Scripts

  • upstream-status.js — Detects upstream remote, fetches latest commits, lists new changes with diffstat and ahead/behind counts
  • conflict-preview.js — Dry-run merge/rebase/cherry-pick conflict detection with file-level risk categorization (HIGH/LOW) and actionable recommendations (SAFE_TO_MERGE, MERGE_WITH_MANUAL_RESOLUTION, CONSIDER_CHERRY_PICK)
  • git-utils.js — Shared utilities with execFileSync-based git wrapper (no shell injection), .env cascade loading, input validation

Integration Strategies

  • Merge — Full branch integration with conflict analysis
  • Rebase — Linear history with local commit replay count estimation
  • Cherry-pick — Per-commit conflict preview against locally modified files

Reference Guides

  • 5-phase sync workflow (setup, review, analyze, integrate, verify)
  • Upstream commit review methodology with decision matrix
  • Conflict resolution strategies prioritized by dependency order

Quality

  • 26 integration tests using real temporary git repos (zero mocks)
  • Zero runtime dependencies — Node.js >= 18 only
  • Input validation on all user-facing args (remote, branch, commit, since)
  • Cross-platform support (Linux/macOS/Windows)

Documentation

  • Full README with installation (copy/symlink), CLI usage examples, sample outputs, and real-world scenarios
Assets 2
Loading