gsd-reapply-patches

To reapply local patches after an update, you need a file-by-file merge process. This Skill detects your saved changes from backups and merges them into newly installed versions, preserving local modifications while integrating upstream updates.

When merging local modifications results in conflicts, the process pauses to request user input for resolution. It provides a summary of conflicting changes, allowing you to decide how to integrate both your patches and upstream updates.

To track which files have local modifications, the tool reads a local patch manifest. It detects patched files from backups, compares them with newly installed versions, and summarizes changes before performing the intelligent merge.

Yes, you can automatically update the patch manifest after merging local changes. The tool updates the local manifest post-merge so future updates accurately track patches, and offers cleanup options to retain or remove patch backups.

The best way to preserve local configuration tweaks during a version upgrade is using section-aware merges. This approach applies file-by-file merges across multiple components, ensuring user additions are preserved while integrating upstream changes.