maintain-friendly-fork

Reconcile local fork patches against upstream with safety branches and per-commit validation.

6|Updated Jul 9, 2019
One-click install
npx skills add https://github.com/sluongng/dotfiles --skill maintain-friendly-fork
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: maintain-friendly-fork
Source: https://github.com/sluongng/dotfiles/tree/main/config/claude/skills/maintain-friendly-fork
Command: npx skills add https://github.com/sluongng/dotfiles --skill maintain-friendly-fork

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Update or restack a friendly fork while preserving a reviewable, independently validated stack of local patches.

Core Features & Use Cases

  • Safety-first upstream refresh: inspects remotes, branches, and upstream default branch, creating a safety backup before any history rewrite.
  • Per-commit validation and topic regrouping: validates each patch during rebase, allows grouping commits into coherent topics, and reports results.
  • Final checks and controlled publish: provides concrete reporting of base changes, dropped patches, and safe push instructions when requested.

Quick Start

Ask the AI to refresh your fork against upstream while preserving a clean, reviewable patch stack.

Frequently Asked Questions about maintain-friendly-fork

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

FAQPage Schema
How do I rebase a local fork against upstream while keeping my patch history clean?

To rebase a local fork cleanly, this workflow reconciles your local patches against the upstream default branch by identifying upstreamed commits, creating safety backup branches, and validating each replayed commit with automated checks.

What is the safest way to update a git fork without losing local commits?

The safest way to update a git fork involves inspecting remotes and branches to create a safety backup before any history rewrite, ensuring local commits are preserved during the upstream refresh process.

How do I validate each git commit during a fork rebase?

Validating each git commit during a fork rebase requires providing per-commit validation commands that run automated checks as patches are replayed, allowing you to catch conflicts and errors immediately.

Can I regroup commits into topics when refreshing my fork against upstream?

Yes, you can regroup commits into coherent topics when refreshing your fork against upstream, allowing you to organize your patch stack while validating each patch during the rebase workflow.

What do I need to safely publish rewritten git history after an upstream rebase?

To safely publish rewritten git history after an upstream rebase, you need controlled push instructions with guardrails, along with detailed reports of base changes and dropped patches to ensure a controlled release.

How does this approach handle conflicts when replaying local patches onto upstream?

When replaying local patches onto upstream, this approach handles conflicts by pausing during the rebase workflow, allowing you to resolve issues manually while preserving your local work through safety branches and cleanup procedures.