gsd-reapply-patches

Reconcile local file modifications with upstream GSD updates using three-way merge logic.

1|Updated Apr 4, 2026
One-click install
npx skills add https://github.com/nnexai/git-stacks --skill gsd-reapply-patches-nnexai
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: gsd-reapply-patches
Source: https://github.com/nnexai/git-stacks/tree/main/.github/skills/gsd-reapply-patches
Command: npx skills add https://github.com/nnexai/git-stacks --skill gsd-reapply-patches-nnexai

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill solves the issue of losing manual customizations and local patches when a GSD (Global System Definition) update overwrites configuration files, ensuring your personalized workflow settings are preserved.

Core Features & Use Cases

  • Three-Way Merging: Uses pristine baselines, user backups, and new versions to intelligently reconcile changes.
  • Heuristic Conflict Resolution: Employs advanced pattern matching to distinguish between mechanical drift and intentional user modifications.
  • Verification: Performs post-merge checks to ensure no code hunks were accidentally dropped during the update process.

Quick Start

Run the gsd-reapply-patches skill to automatically detect your local backup directory and merge your customizations into the newly updated configuration files.

Frequently Asked Questions about gsd-reapply-patches

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

FAQPage Schema
How do I recover local configuration customizations after a system update overwrites them?

To recover local configuration customizations, you can reconcile local file modifications with upstream updates using a three-way merge logic and heuristic analysis to restore your backed-up patches.

What is three-way merge logic for restoring configuration patches?

Three-way merge logic for restoring patches compares pristine baselines, user backups, and new versions to intelligently reconcile changes. This distinguishes between mechanical drift and intentional user modifications during updates.

Do I need git history to reconcile local patches with upstream updates?

Yes, you need git history or pristine snapshots to perform accurate baseline comparisons and conflict detection when reconciling local patches with upstream updates.

How does heuristic analysis distinguish between mechanical drift and intentional modifications?

Heuristic analysis distinguishes mechanical drift from intentional modifications by employing advanced pattern matching to evaluate file differences during the merge process, ensuring your customizations are preserved.

What is the best way to verify no code hunks were dropped during a configuration merge?

The best way to verify no code hunks were dropped is to perform post-merge checks. This verification step ensures no customizations were accidentally lost during the update process.

Why does updating configuration files overwrite my manual patches?

Updating configuration files overwrites manual patches because system-wide updates replace existing files. You need a patching tool that targets backup directories to restore your personalized workflow settings.