What is the 'Clean Mirror' principle in this skill?

The principle dictates that the 'mirror' branch must always be an exact copy of upstream/main with zero custom commits, ensuring a stable base for fast-forward merges and conflict-free updates.

Can I stop and resume a merge evaluation session?

Yes, the skill saves its evaluation state to a JSON file, allowing you to pause complex reviews and resume exactly where you left off across different sessions.

How does the skill handle large merges with many commits?

It uses a systematic evaluation process (Phase 1.6) that breaks down changes by module, identifies high-risk files, and allows you to build a 'shopping list' for how to handle each conflict.

What does the generated resolution script actually do?

It produces a bash script that automatically applies specific strategies (like rebranding, keeping local versions, or accepting upstream deletions) to resolve mechanical conflicts in seconds.

Fork Sync Manager

Name: Fork Sync Manager
Author: NikolasP98

byNikolasP98

0•

開発者ツール

Automates syncing Git forks with upstream repositories while maintaining clean mirror branches and managing complex branch hierarchies.

The Fork Sync skill provides a standardized workflow for developers maintaining forks of high-velocity projects. It enforces a 'clean mirror' principle to ensure the source of truth remains untainted by custom commits, facilitates deep module-by-module evaluation of upstream changes, and generates automated resolution scripts to handle mechanical merge conflicts. This tool is essential for teams managing multi-tier branch structures like integration (DEV) and production (main) while staying up-to-date with upstream features and security patches.

主な機能

01Systematic module-by-module upstream evaluation

02Resumable merge evaluation state management

030 GitHub stars

04Clean mirror enforcement and divergence detection

05Pre-merge impact and risk analysis

06Automated conflict resolution script generation

ユースケース

01Managing custom feature integration across multiple development branches

02Maintaining a long-running fork with frequent upstream updates

03Resolving complex merge conflicts systematically after large upstream gaps

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add nikolasp98/minion_plugins fork-sync

For use in Claude.ai and ChatGPT

Download Skill