|
|
@ -33,6 +33,8 @@ function mergeEnvironments( |
|
|
case 'deepmerge': |
|
|
case 'deepmerge': |
|
|
return new SetEnvironment(deepMerge(local, remote)); |
|
|
return new SetEnvironment(deepMerge(local, remote)); |
|
|
case 'overwrite': |
|
|
case 'overwrite': |
|
|
|
|
|
case null: |
|
|
|
|
|
case undefined: |
|
|
return new SetEnvironment(remote); |
|
|
return new SetEnvironment(remote); |
|
|
default: |
|
|
default: |
|
|
return new SetEnvironment(config.mergeStrategy(local, remote)); |
|
|
return new SetEnvironment(config.mergeStrategy(local, remote)); |
|
|
|