@eide/foir-cli 0.21.0 → 0.21.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +3 -2
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -4905,7 +4905,7 @@ async function reconcileModels(client, configId, models, summary, force, conflic
|
|
|
4905
4905
|
const cfgFields = m.fields ?? [];
|
|
4906
4906
|
const platFields = ex.fields ?? [];
|
|
4907
4907
|
const snapFields = ex.lastPushedFields;
|
|
4908
|
-
const hasSnapshot =
|
|
4908
|
+
const hasSnapshot = ex.lastPushedAt != null;
|
|
4909
4909
|
const { merged, conflicts } = threeWayMergeKeyed(
|
|
4910
4910
|
indexByKey(cfgFields),
|
|
4911
4911
|
indexByKey(platFields),
|
|
@@ -4930,7 +4930,8 @@ async function reconcileModels(client, configId, models, summary, force, conflic
|
|
|
4930
4930
|
if (manifestKeys.has(key)) continue;
|
|
4931
4931
|
const platFields = ex.fields ?? [];
|
|
4932
4932
|
const snapFields = ex.lastPushedFields;
|
|
4933
|
-
|
|
4933
|
+
const hasSnapshot = ex.lastPushedAt != null;
|
|
4934
|
+
if (hasSnapshot && !deepEqual(platFields, snapFields)) {
|
|
4934
4935
|
conflictOut.push({
|
|
4935
4936
|
modelKey: key,
|
|
4936
4937
|
fieldKey: "<model>",
|