skills.rest
thecomputer07
thecomputer07COMMUNITY
Explore all skills by this author →
GitHub

qsd-reapply-patches

Merge user-modified qsd patches into new releases via three-way comparison.

Updated Apr 13, 2026
Search Tags:#merge#patch#version-control#patch-management#local-modifications#qsd
One-click install
npx skills add https://github.com/thecomputer07/qsd --skill qsd-reapply-patches
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: qsd-reapply-patches
Source: https://github.com/thecomputer07/qsd/tree/main/skills/qsd-reapply-patches
Command: npx skills add https://github.com/thecomputer07/qsd --skill qsd-reapply-patches

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

After a qsd update wipes and reinstalls files, this workflow merges the user's previously saved local modifications back into the new version. It uses a three-way comparison (pristine baseline, user-modified backup, newly installed version) to reliably distinguish user customizations from version drift.

Critical invariant: Every file in qsd-local-patches/ was backed up because the installer's hash comparison detected it was modified. The workflow must NEVER conclude "no custom content" for any backed-up file — that is a logical contradiction. When in doubt, classify as CONFLICT requiring user review, not SKIP.

Core Features & Use Cases

  • Detect and backup modified files during qsd updates, enabling a three-way merge against the upstream version.
  • Preserve user changes while integrating new upstream updates, with conflict prompts when changes collide.
  • Ensure no custom content is lost by flagging and surfacing potential conflicts for user review.

Quick Start

Run the qsd update flow to automatically reapply your local patches after a new install.

Frequently Asked Questions about qsd-reapply-patches

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

FAQPage Schema
How do I preserve local modifications when applying a version control update?▼

To preserve local modifications during a version control update, a three-way merge reconciles user-modified backups with a pristine baseline and the newly installed version to reliably integrate customizations.

What is a three-way merge for patch management?▼

A three-way merge for patch management compares a pristine baseline, user-modified backups, and a new release to distinguish user customizations from version drift and surface conflicts for resolution.

How do I reapply local patches after a software update wipes files?▼

To reapply local patches after an update wipes files, run the update flow to automatically merge backed up files from qsd-local-patches against the newly installed version using a pristine baseline.

Do I need a git history baseline to reconcile user-modified patches?▼

Yes, reconciling user-modified patches requires a pristine baseline obtained from git history or a qsd-pristine snapshot to accurately evaluate differences and classify user customizations during the merge.

What happens when custom content conflicts with upstream version drift?▼

When custom content conflicts with upstream version drift, the merge process flags the collision as a conflict requiring user review, ensuring no custom content is lost or automatically discarded.

Related Skills

Explore More Software Engineering Skills→
Poom5741Poom5741

gsd-reapply-patches

Merge user-local patches into a fresh GSD installation with conflict handling.

Community
Advanced
gujiachun-rainbowgujiachun-rainbow
8

Pulling Updates from Skills Repository

Sync local skills repository with upstream changes while preserving local modifications.

Community
Intermediate
coco-researchcoco-research
264

gsd-reapply-patches

Reapplies saved local patches after a GSD update overwrites customized files.

Community
Advanced
RightNow-AIRightNow-AI
18.1k

git-expert

Guide Git branching, rebasing, merging, and conflict resolution.

Official
Intermediate