From 07743782bc8343ff42ce76355b6f4d283c44f58b Mon Sep 17 00:00:00 2001 From: Kevin Jump Date: Tue, 16 Apr 2024 16:57:33 +0100 Subject: [PATCH] DataType merging Empty items alway win --- uSync.Core/Tracking/Impliment/DataTypeTracker.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uSync.Core/Tracking/Impliment/DataTypeTracker.cs b/uSync.Core/Tracking/Impliment/DataTypeTracker.cs index 1a7c71e6..badc9609 100644 --- a/uSync.Core/Tracking/Impliment/DataTypeTracker.cs +++ b/uSync.Core/Tracking/Impliment/DataTypeTracker.cs @@ -42,6 +42,8 @@ public DataTypeTracker( public override XElement MergeFiles(XElement a, XElement b) { + if (b.IsEmptyItem()) return b; + var editorAlias = GetEditorAlias(a); var merger = GetConfigMerger(editorAlias); if (!string.IsNullOrEmpty(editorAlias) && merger != null)