Skip to content

Commit

Permalink
fix: config bundle storage conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
robot9706 committed Dec 14, 2024
1 parent 66ed46d commit 7c1ef45
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion web/crux/src/domain/container-conflict.ts
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,13 @@ const collectConflicts = (
}

const checkStorageConflict = () => {
if (objectsConflict(one, other)) {
if (typeof one.storageSet !== 'boolean' || typeof other.storageSet !== 'boolean') {
// one of them are null or uninterpretable
return false
}

if (one.storageSet && other.storageSet) {
// both cannot be set
conflicts.storage = appendConflict(conflicts.storage, one.id, other.id)
}
}
Expand Down

0 comments on commit 7c1ef45

Please sign in to comment.