DataType merging Empty items alway win

KevinJump · Apr 16, 2024 · 0774378 · 0774378
1 parent abdc722
commit 0774378
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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)