MergeStrategy Option.

[KevinJump]

Pass an option all the way down, to diffirentiate between No Merge, Fancy Merging and Magic merging

We are putting this option on hold, and is might be to large a change so close to release of v17
(as it stands we need to do something with ISyncTracker implimentations)

We will revisit it for v17.1+ when there is less time pressure,

[Copilot]

Pull Request Overview

This PR introduces a MergeStrategy option to differentiate between three merge approaches: None (no merging), Fancy (block-level merging), and Magic (property-level merging). The changes thread this option through the entire sync tracking and merging pipeline, from constants to handlers.

Key Changes:

• Added SyncMergeStrategy enum with None, Fancy, and Magic options
• Introduced SyncFileMergeOptions class to encapsulate merge strategy settings
• Updated interfaces and implementations to accept merge options throughout the codebase

Reviewed Changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
uSync.Core/uSyncConstants.cs	Added MergeStrategy constant and default value (Magic)
uSync.Core/Roots/Models/SyncMergeOptions.cs	New file defining SyncMergeStrategy enum and SyncFileMergeOptions class
uSync.Core/Tracking/ISyncTracker.cs	Added ISyncTrackerOptionsBase interface with options-aware methods
uSync.Core/Tracking/SyncXmlTracker.cs	Minor formatting changes to MergeFiles method
uSync.Core/Tracking/SyncXmlTrackAndMerger.cs	Updated MergeFiles and GetDifferences to accept options
uSync.Core/Tracking/SyncRootMergerHelper.cs	Threading options through helper methods
uSync.Core/Tracking/Impliment/DataTypeTracker.cs	Updated GetDifferences to use options parameter
uSync.Core/Roots/Configs/ISyncConfigMerger.cs	Added options parameter to GetDifferenceConfig, marked old version obsolete
uSync.Core/Roots/Configs/SyncConfigMergerBase.cs	Implemented merge strategy logic at property level
uSync.Core/Roots/Configs/ImageCropperConfigMerger.cs	Updated GetDifferenceConfig signature with options
uSync.Core/Roots/Configs/BlockListConfigMerger.cs	Updated GetDifferenceConfig signature with options
uSync.Core/Roots/Configs/BlockGridConfigMerger.cs	Updated GetDifferenceConfig signature with options
uSync.BackOffice/Models/SyncMergeOptions.cs	Added MergeStrategy property (defaults to Fancy)
uSync.BackOffice/Services/ISyncFileService.cs	Added obsolete overloads and updated signatures with options
uSync.BackOffice/Services/SyncFileService.cs	Implemented options-aware merge and difference methods
uSync.BackOffice/Services/SyncService_Files.cs	Updated to create and pass merge options
uSync.BackOffice/Services/ISyncService.cs	Updated documentation for merge method
uSync.BackOffice/SyncHandlers/SyncHandlerRoot.cs	Plumbing options through handler merge operations

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

[nitpick] Interface design issue: Both ISyncTrackerBase and ISyncTrackerOptionsBase contain a MergeFiles method with different signatures. Since ISyncTrackerOptionsBase inherits from ISyncTrackerBase, implementers of ISyncTrackerOptionsBase will need to implement both versions. Consider marking the parameterless version in ISyncTrackerBase as obsolete or documenting that implementations should prefer the version with options.