Environment options should take priority over generator options.

yeoman · Mar 4, 2021 · cfb8daf · cfb8daf
1 parent c5ba38d
commit cfb8daf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/environment.js b/lib/environment.js
@@ -881,7 +881,7 @@ class Environment extends Base {
     return new Promise((resolve, reject) => {
       if (this.conflicter === undefined) {
         const conflicterOptions = _.pick(
-          _.defaults({}, options, this.options),
+          _.defaults({}, this.options, options),
           ['force', 'bail', 'ignoreWhitespace', 'dryRun', 'skipYoResolve', 'logCwd']
         );
         conflicterOptions.cwd = conflicterOptions.logCwd;