gsd-reapply-patches

Patch recovery uses a three-way merge to compare the pristine baseline, your backed-up user version, and the newly installed files. It preserves intentional edits while surfacing overlapping upstream changes for manual conflict resolution.

A three-way merge compares the original baseline, your saved local version, and the new update to identify intentional changes. Instead of silently discarding edits, it detects overlapping upstream and user modifications and surfaces them as conflicts for review.

You reapply saved patches by running this skill across your config directories. It merges your custom command and agent file edits into the refreshed versions and verifies that no content hunks were dropped during the workflow restoration process.

No, update migration does not silently overwrite changes. This skill detects overlapping upstream and user modifications, surfacing them explicitly as conflicts for review to ensure intentional local modifications are safely preserved during the update.

If hunks are dropped during the merge, verification safeguards catch the missing content. The skill performs post-merge verification and warns you when content may be missing, ensuring no intentional changes are lost silently.

You need conflict resolution for local modifications when a GSD update overwrites customized workflow, command, or agent files across config directories. It is required to safely merge user edits into refreshed files without losing intentional changes.