gsd-reapply-patches

Reapply user patches to updated GSD files using three-way or two-way merges.

Updated Apr 22, 2026

Search Tags:#automation #merge #patches #version-control #gsd #patch-management

Ready to run

npx skills add https://github.com/hadpadrahul/school-erp --skill gsd-reapply-patches-hadpadrahul

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: gsd-reapply-patches
Source: https://github.com/hadpadrahul/school-erp/tree/main/.codex/skills/gsd-reapply-patches
Command: npx skills add https://github.com/hadpadrahul/school-erp --skill gsd-reapply-patches-hadpadrahul

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Automates restoration of user customizations after a GSD update by merging patches backed up during installation with the updated GSD files, preserving intent and avoiding loss of work.

Core Features & Use Cases

Three-way merge when a pristine baseline is available, preserving user changes while incorporating upstream updates.
Enhanced two-way merge fallback when no baseline exists, with mechanical drift analysis to distinguish templates from user customizations.
Post-merge verification and hunk analysis to ensure no user content is dropped, with optional patch-backups cleanup.

Quick Start

Run the gsd-reapply-patches command to reapply local modifications after a GSD update.

Frequently Asked Questions about gsd-reapply-patches

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

FAQPage Schema

How do I reapply local patches after a version control update?▼

To reapply local patches after an update, run the reapply command to reassemble backed-up user modifications into the updated installation, utilizing three-way merges when a pristine baseline is available or enhanced two-way merges otherwise.

What is the best way to merge custom modifications without losing content during patch restoration?▼

The best way to merge custom modifications during patch restoration is using three-way merges with a pristine baseline, incorporating post-merge verification and hunk analysis to ensure no user content is inadvertently dropped.

How does a two-way merge handle patch restoration without a pristine baseline?▼

An enhanced two-way merge handles patch restoration without a pristine baseline by using mechanical drift analysis to distinguish templates from user customizations, serving as a fallback to apply patches and resolve conflicts.

Do I need a pristine baseline from git history to restore local modifications?▼

You do not need a pristine baseline from git history to restore local modifications, as the process falls back to an enhanced two-way merge with mechanical drift analysis, but having one enables more accurate three-way merges.

Why does post-merge verification matter when reapplying user customizations?▼

Post-merge verification matters when reapplying user customizations because it performs hunk analysis and integrity checks to ensure no custom content is inadvertently dropped during the patch restoration process.