From 687f86b2f2e19fc645857f4a7e86f745c2ae7625 Mon Sep 17 00:00:00 2001
From: Kelly Selden <kellyselden@gmail.com>
Date: Fri, 3 Jan 2020 11:38:23 +0000
Subject: [PATCH] allow init to go through git and get conflicts

instead of acting like reset with just a copy
---
 src/init.js                              | 6 +-----
 test/acceptance/ember-cli-update-test.js | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/init.js b/src/init.js
index 5e53e3ab2..54f214990 100644
--- a/src/init.js
+++ b/src/init.js
@@ -92,19 +92,15 @@ module.exports = async function init({
     blueprint
   });
 
-  let init = false;
-
   if (!baseBlueprint) {
     // for non-existing default blueprints
     blueprint.isBaseBlueprint = true;
-    init = true;
   }
 
   let result = await (await boilerplateUpdate({
     endVersion: blueprint.version,
     resolveConflicts,
     reset,
-    init,
     createCustomDiff: true,
     customDiffOptions: ({
       packageJson
@@ -122,7 +118,7 @@ module.exports = async function init({
     blueprint
   });
 
-  if (!(reset || init)) {
+  if (!reset) {
     await stageBlueprintFile({
       cwd,
       emberCliUpdateJsonPath
diff --git a/test/acceptance/ember-cli-update-test.js b/test/acceptance/ember-cli-update-test.js
index 37135fc60..ea64a1a3b 100644
--- a/test/acceptance/ember-cli-update-test.js
+++ b/test/acceptance/ember-cli-update-test.js
@@ -64,7 +64,8 @@ describe(function() {
     if (init) {
       args = [
         'init',
-        `--to=${to}`
+        `--to=${to}`,
+        '--resolve-conflicts'
       ];
     }
     if (install) {