gsd-reapply-patches

To reapply local patches after an update, run the reapply command to reassemble backed-up user modifications into the updated installation, utilizing three-way merges when a pristine baseline is available or enhanced two-way merges otherwise.

The best way to merge custom modifications during patch restoration is using three-way merges with a pristine baseline, incorporating post-merge verification and hunk analysis to ensure no user content is inadvertently dropped.

An enhanced two-way merge handles patch restoration without a pristine baseline by using mechanical drift analysis to distinguish templates from user customizations, serving as a fallback to apply patches and resolve conflicts.

You do not need a pristine baseline from git history to restore local modifications, as the process falls back to an enhanced two-way merge with mechanical drift analysis, but having one enables more accurate three-way merges.

Post-merge verification matters when reapplying user customizations because it performs hunk analysis and integrity checks to ensure no custom content is inadvertently dropped during the patch restoration process.