gsd-reapply-patches

To reapply local patches after a GSD update, trigger the patch reapply process to safely merge your user changes back into the new version using a three-way baseline-aware merge strategy. This preserves local modifications while integrating upstream updates.

A three-way baseline-aware merge for local patches uses a pristine baseline or gsd-pristine snapshot to compare custom edits against the updated release. This mechanism preserves user modifications while applying upstream updates and detecting conflicts.

Yes, you need Git-based or pristine baseline sources to merge local patches during a GSD upgrade. The merge process requires these sources to accurately detect backed-up patches and execute robust merge rules with post-merge verification.

Conflict detection when reapplying custom files to a new baseline identifies mismatches between user edits and upstream updates, providing guided resolution to prevent accidental overwrites. This ensures customizations survive the upgrade safely.

The best way to verify user customizations survive an upgrade is through post-merge verification and reporting. After applying the three-way merge, this process checks that all local patches are intact and properly integrated into the updated release.