fix: TRAC-513 - clear stale variation override on stencil pull (#1374)

Author: parthshahp

lib/stencil-pull.utils.js

@@ -74,15 +74,19 @@ utils.mergeThemeConfiguration = async (options) => {
             continue;
         }
         const defaultVal = localConfig.settings[key];
+        // Compare against the variation override (when present) so stale ones get cleared.
+        const effectiveLocalVal = _.has(variation.settings, key)
+            ? variation.settings[key]
+            : defaultVal;
         // Check for different types, and throw an error if they are found
-        if (typeof defaultVal !== typeof remoteVal) {
+        if (typeof effectiveLocalVal !== typeof remoteVal) {
             throw new Error(
                 `Theme configuration key "${key}" cannot be merged because it is not of the same type. ` +
-                    `Remote configuration is of type ${typeof remoteVal} while local configuration is of type ${typeof defaultVal}.`,
+                    `Remote configuration is of type ${typeof remoteVal} while local configuration is of type ${typeof effectiveLocalVal}.`,
             );
         }
         // If a different value is found, overwrite the local config
-        if (!_.isEqual(defaultVal, remoteVal)) {
+        if (!_.isEqual(effectiveLocalVal, remoteVal)) {
             if (!variation.settings) {
                 variation.settings = {};
             }