From v13: DataType merging Empty items alway win

KevinJump · Apr 17, 2024 · dce7379 · dce7379
1 parent cb33fa6
commit dce7379
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
@@ -32,6 +32,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)