skills.rest
TruCol270
TruCol270COMMUNITY
Explore all skills by this author →
GitHub

gsd-reapply-patches

Reapply local patches into refreshed GSD installations with three-way or two-way merges.

1|Updated Apr 7, 2026
Search Tags:#merge#updates#baseline#conflict-resolution#patches#version-control#gsd
One-click install
npx skills add https://github.com/TruCol270/salty-pickle --skill gsd-reapply-patches-trucol270
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: gsd-reapply-patches
Source: https://github.com/TruCol270/salty-pickle/tree/main/.claude-skills/gsd-reapply-patches
Command: npx skills add https://github.com/TruCol270/salty-pickle --skill gsd-reapply-patches-trucol270

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Reapply local modifications after a GSD update to restore user patches into the refreshed installation.

Core Features & Use Cases

  • Detect local patches and identify baselines for precise merging
  • Perform three-way merges when a pristine baseline is available, or strengthened two-way merges otherwise
  • Generate per-file merge reports and guidance for unresolved conflicts

Quick Start

Run gsd-reapply-patches to merge your local patches back into the updated GSD installation.

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 an update overwrites my configuration files?▼

To reapply local patches after an update, the skill performs deterministic three-way merges using a pristine baseline. When a baseline is absent, it executes strengthened two-way merges to restore your custom modifications into the refreshed installation.

What is the best way to resolve merge conflicts when restoring local modifications across multiple config directories?▼

Resolving merge conflicts across multiple config directories is handled by generating per-file merge reports. The deterministic workflow identifies baselines and provides specific guidance for unresolved conflicts during the patch reapplication process.

Do I need a pristine baseline to perform a three-way merge for version control patches?▼

A pristine baseline is required for precise three-way merges during version control updates. If a pristine baseline via gsd-pristine or git history is unavailable, the skill automatically falls back to an enhanced two-way merge strategy.

Can I use git history as a baseline source for merging local patches?▼

Git history can be used as a baseline source for merging local patches. The tool accepts pristine baselines from gsd-pristine or git history to accurately calculate differences and execute accurate three-way merges.

Why does the patch reapplication process require access to the gsd-local-patches directory?▼

The gsd-local-patches directory is required because it stores the local modifications that must be reapplied. The tool reads this directory to detect your patches and merge them back into the updated GSD installation.

What happens when a pristine baseline is missing during a local patch merge?▼

When a pristine baseline is missing, the local patch merge switches to a strengthened two-way merge. This approach still restores your modifications into the refreshed installation while providing per-file reporting for any conflicts.

Related Skills

Explore More Software Engineering Skills→
hadpadrahulhadpadrahul

gsd-reapply-patches

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

Community
Advanced
lalaABClalaABC

resolve-merge-conflicts

Extract unresolved paths, conflict hunks, and compact diffs from Git merges.

Community
Intermediate
dobrinz123dobrinz123

gsd-reapply-patches

Reapply local modifications to restored GSD files via three-way merge.

Community
Advanced
D0NMEGAD0NMEGA
8

gsd-reapply-patches

Merge backed-up patches into updated GSD versions with three-way or two-way fallback.

Community
Advanced