feat!: remove deprecated --resolve-conflicts

README.md

@@ -47,7 +47,7 @@ This will update your app or addon to the latest Ember CLI version. It does this
 
 This is different from the existing `ember init` command. That command tries to reset your project back to a brand new project. It removes all your changes and additions.
 
-You will probably encounter merge conflicts, in which the default behavior is to let you resolve conflicts on your own. You can supply the `--resolve-conflicts` option to run your system's git merge tool if any conflicts are found.
+You will probably encounter merge conflicts, in which the default behavior is to let you resolve conflicts on your own. If any conflicts are found, you can run your system's git merge tool via `git mergetool`.
 
 This tool can also run codemods for you. The option `--run-codemods` will figure out what codemods apply to your current version of Ember.js, and download and run them for you.
 

bin/commands/default.js

@@ -32,24 +32,10 @@ module.exports.handler = async function handler(argv) {
       result = await emberCliUpdate(argv);
     }
 
-    let ps = result.resolveConflictsProcess;
-    if (ps) {
-      process.stdin.pipe(ps.stdin);
-      ps.stdout.pipe(process.stdout);
-      ps.stderr.pipe(process.stderr);
-    }
-
     let message = await result.promise;
     if (message) {
       console.log(message);
     }
-
-    // since we are piping, not inheriting, the child process
-    // doesn't have the power to close its parent
-    if (ps) {
-      // eslint-disable-next-line no-process-exit
-      process.exit();
-    }
   } catch (err) {
     console.error(err);
   }

bin/commands/init.js

@@ -10,7 +10,6 @@ module.exports.describe = 'initialize a blueprint';
 module.exports.builder = {
   blueprint: args['blueprint'],
   to: args['to'],
-  resolveConflicts: args['resolve-conflicts'],
   outputRepo: args['output-repo'],
   codemodsSource: args['codemods-source']
 };
@@ -22,24 +21,10 @@ module.exports.handler = async function handler(argv) {
       blueprintOptions: argv._.slice(1)
     });
 
-    let ps = result.resolveConflictsProcess;
-    if (ps) {
-      process.stdin.pipe(ps.stdin);
-      ps.stdout.pipe(process.stdout);
-      ps.stderr.pipe(process.stderr);
-    }
-
     let message = await result.promise;
     if (message) {
       console.log(message);
     }
-
-    // since we are piping, not inheriting, the child process
-    // doesn't have the power to close its parent
-    if (ps) {
-      // eslint-disable-next-line no-process-exit
-      process.exit();
-    }
   } catch (err) {
     console.error(err);
   }

bin/commands/reset.js

@@ -17,24 +17,10 @@ module.exports.handler = async function handler(argv) {
   try {
     let result = await reset(argv);
 
-    let ps = result.resolveConflictsProcess;
-    if (ps) {
-      process.stdin.pipe(ps.stdin);
-      ps.stdout.pipe(process.stdout);
-      ps.stderr.pipe(process.stderr);
-    }
-
     let message = await result.promise;
     if (message) {
       console.log(message);
     }
-
-    // since we are piping, not inheriting, the child process
-    // doesn't have the power to close its parent
-    if (ps) {
-      // eslint-disable-next-line no-process-exit
-      process.exit();
-    }
   } catch (err) {
     console.error(err);
   }

src/args.js

@@ -19,11 +19,6 @@ module.exports = {
     type: 'string',
     description: 'Update to a version that isn\'t latest ("2.14.1", "~2.15", "latest", "beta")'
   },
-  'resolve-conflicts': {
-    type: 'boolean',
-    default: false,
-    description: 'Automatically run git mergetool if conflicts found'
-  },
   'run-codemods': {
     type: 'boolean',
     default: false,

src/command.js

@@ -36,12 +36,6 @@ module.exports = {
       type: String,
       default: args['to'].default
     },
-    {
-      name: 'resolve-conflicts',
-      description: args['resolve-conflicts'].description,
-      type: Boolean,
-      default: args['resolve-conflicts'].default
-    },
     {
       name: 'run-codemods',
       description: args['run-codemods'].description,
@@ -105,13 +99,6 @@ module.exports = {
       result = await emberCliUpdate(options);
     }
 
-    let ps = result.resolveConflictsProcess;
-    if (ps) {
-      process.stdin.pipe(ps.stdin);
-      ps.stdout.pipe(process.stdout);
-      ps.stderr.pipe(process.stderr);
-    }
-
     await result.promise;
   }
 };

src/index.js

@@ -60,8 +60,7 @@ module.exports = async function emberCliUpdate({
   packageName,
   blueprint: _blueprint,
   from,
-  to,
-  resolveConflicts
+  to
 } = {}) {
   // A custom config location in package.json may be reset/init away,
   // so we can no longer look it up on the fly after the run.
@@ -177,16 +176,10 @@ module.exports = async function emberCliUpdate({
     to = defaultTo;
   }
 
-  if (resolveConflicts) {
-    // eslint-disable-next-line no-console
-    console.warn('`--resolve-conflicts` is deprecated. Please run `git mergetool` manually.');
-  }
-
   let endBlueprint;
 
   let {
-    promise,
-    resolveConflictsProcess
+    promise
   } = await boilerplateUpdate({
     cwd,
     projectOptions: ({ packageJson }) => getProjectOptions(packageJson, blueprint),
@@ -223,7 +216,6 @@ module.exports = async function emberCliUpdate({
         customDiffOptions
       };
     },
-    resolveConflicts,
     createCustomDiff: true,
     ignoredFiles: [await getBlueprintRelativeFilePath(cwd)]
   });
@@ -243,7 +235,6 @@ module.exports = async function emberCliUpdate({
       });
 
       return result;
-    })(),
-    resolveConflictsProcess
+    })()
   };
 };

src/init.js

@@ -22,7 +22,6 @@ module.exports = async function init({
   packageName,
   blueprint: _blueprint,
   to = defaultTo,
-  resolveConflicts,
   outputRepo,
   codemodsSource,
   blueprintOptions = []
@@ -127,18 +126,11 @@ module.exports = async function init({
     init = true;
   }
 
-  if (resolveConflicts) {
-    // eslint-disable-next-line no-console
-    console.warn('`--resolve-conflicts` is deprecated. Please run `git mergetool` manually.');
-  }
-
   let {
-    promise,
-    resolveConflictsProcess
+    promise
   } = await boilerplateUpdate({
     cwd,
     endVersion: blueprint.version,
-    resolveConflicts,
     init,
     createCustomDiff: true,
     customDiffOptions: ({
@@ -168,7 +160,6 @@ module.exports = async function init({
       }
 
       return result;
-    })(),
-    resolveConflictsProcess
+    })()
   };
 };

src/reset.js

@@ -88,8 +88,7 @@ module.exports = async function reset({
     }
 
     let {
-      promise,
-      resolveConflictsProcess
+      promise
     } = await boilerplateUpdate({
       cwd,
       endVersion: blueprint.version,
@@ -115,8 +114,7 @@ module.exports = async function reset({
         });
 
         return result;
-      })(),
-      resolveConflictsProcess
+      })()
     };
   } catch (err) {
     return { promise: Promise.reject(err) };

test/acceptance/ember-addon-test.js

@@ -39,8 +39,7 @@ describe(function() {
       bin: 'ember',
       args: [
         'update',
-        `--to=${to}`,
-        '--resolve-conflicts'
+        `--to=${to}`
       ],
       cwd: tmpPath,
       commitMessage,

test/acceptance/ember-cli-update-test.js

@@ -55,8 +55,7 @@ describe(function() {
     await beforeMerge();
 
     let args = [
-      ...to ? [`--to=${to}`] : [],
-      '--resolve-conflicts'
+      ...to ? [`--to=${to}`] : []
     ];
     if (listCodemods || runCodemods) {
       args = [