gsd-reapply-patches

The patch merge process compares a pristine baseline, your user backup, and the new version to isolate changes and preserve user edits, falling back to an enhanced two-way merge with strengthened heuristics when no baseline is available.

A three-way merge during a GSD update compares a pristine baseline, your user backup, and the new version to isolate changes and preserve user edits, falling back to enhanced two-way heuristics when no baseline is available.

When no pristine baseline is available for merging patches, the system applies an enhanced two-way fallback using strengthened heuristics to distinguish mechanical drift from genuine customization and maintain your modifications.

You do not strictly need git history for patch management baseline discovery, as the system can locate baselines via git history or alternatively through gsd-pristine snapshots to enable proper patch merging.

To identify patch merge conflicts after updating your GSD baseline, review the per-file merge reporting generated by the workflow, which provides detailed status updates to guide conflict resolution.

The best way to manage patch conflicts when upgrading GSD projects is to use an automated patch lifecycle that locates patches, determines baselines via git or snapshots, performs merges, and generates per-file status reports to guide resolution.