gsd-reapply-patches

Name: gsd-reapply-patches
Availability: InStock
Author: rkz91

Merge user local patches after GSD updates using three-way baseline-aware merging.

264|11|Updated Apr 25, 2026

Search Tags:#merge #baseline #update #patch #conflicts #gsd

Ready to run

npx skills add https://github.com/rkz91/coco --skill gsd-reapply-patches-rkz91

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: gsd-reapply-patches
Source: https://github.com/rkz91/coco/tree/main/systems/gsd/skills/gsd-reapply-patches
Command: npx skills add https://github.com/rkz91/coco --skill gsd-reapply-patches-rkz91

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Reapply local modifications after a GSD update by safely merging user changes back into the new version, ensuring nothing is lost.

Core Features & Use Cases

Three-way merge with a pristine baseline or gsd-pristine snapshot to preserve user edits while applying upstream updates.
Conflict detection and guided resolution to prevent accidental overwrites.
Post-merge verification and reporting to verify that user customizations survive the upgrade.

Quick Start

Trigger the patch reapply process after updating GSD to automatically merge your local patches with the updated release.

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 GSD update without losing my modifications?▼

To reapply local patches after a GSD update, trigger the patch reapply process to safely merge your user changes back into the new version using a three-way baseline-aware merge strategy. This preserves local modifications while integrating upstream updates.

What is a three-way baseline-aware merge for local patches?▼

A three-way baseline-aware merge for local patches uses a pristine baseline or gsd-pristine snapshot to compare custom edits against the updated release. This mechanism preserves user modifications while applying upstream updates and detecting conflicts.

Do I need Git to merge local patches during a GSD upgrade?▼

Yes, you need Git-based or pristine baseline sources to merge local patches during a GSD upgrade. The merge process requires these sources to accurately detect backed-up patches and execute robust merge rules with post-merge verification.

How does conflict detection work when reapplying custom files to a new baseline?▼

Conflict detection when reapplying custom files to a new baseline identifies mismatches between user edits and upstream updates, providing guided resolution to prevent accidental overwrites. This ensures customizations survive the upgrade safely.

What's the best way to verify user customizations survive an upgrade?▼

The best way to verify user customizations survive an upgrade is through post-merge verification and reporting. After applying the three-way merge, this process checks that all local patches are intact and properly integrated into the updated release.