Fix merge not overwriting values (#343)

dphfox · Jun 11, 2024 · 01e3f53 · 01e3f53
1 parent d022d36
commit 01e3f53
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Utility/merge.luau b/src/Utility/merge.luau
@@ -20,10 +20,10 @@ local function merge(
 		return into
 	else
 		for key, value in from do
-			if into[key] == nil then
-				into[key] = value
-			elseif overwrite == "none" then
+			if into[key] ~= nil and overwrite == "none" then
 				External.logError("mergeConflict", nil, tostring(key))
+			else
+				into[key] = value
 			end
 		end
 		return merge(if overwrite == "first" then "none" else overwrite, into, ...)