shine-reapply-patches

To restore local modifications after a SHINE update, merge saved user patches back into the new installation using a three-way comparison. This process distinguishes your customizations from upstream version drift by comparing the pristine baseline, your modified backup, and the newly installed version.

Three-way merge conflict resolution for local patches compares the pristine baseline, user-modified backup, and new installation to reconcile changes. When both the user patch and the new version modify the same code, it raises conflicts for manual resolution and provides per-file merge guidance.

Baseline reconciliation works by enforcing a comparison against a pristine baseline or git history before merging. This ensures user customizations are accurately distinguished from upstream changes during the patch reapplication workflow, preventing accidental overwrites of your local modifications.

Yes, you can use git history for conflict resolution if a pristine baseline is unavailable. The merge enforces baseline reconciliation via pristine files or git history, applying an enhanced two-way merge to reliably reintegrate your local patches into the updated SHINE install.

When both your local patch and the new SHINE version change the same file, the merge raises conflicts for manual resolution. It surfaces per-file merge results with clear guidance and merge rationale, ensuring you review and correctly integrate both sets of modifications.

You should run a patch reapplication workflow immediately after completing a SHINE upgrade. Running it right after the update ensures your local modifications are merged into the new installation before any further changes, minimizing version drift and simplifying conflict resolution.