Skip to content

Commit

Permalink
Fix merge not overwriting values (again) (#394)
Browse files Browse the repository at this point in the history
  • Loading branch information
lukadev-0 authored Nov 9, 2024
1 parent 6a69a98 commit 29fc29a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Utility/merge.luau
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ local function merge(
else
for _, fromTable in fromTables do
for key, value in fromTable do
if into[key] == nil then
if overwrite or into[key] == nil then
into[key] = value
elseif not overwrite then
External.logError("mergeConflict", nil, tostring(key))
Expand Down

0 comments on commit 29fc29a

Please sign in to comment.