Skip to content

WIP allow init to go through git and get conflicts #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP allow init to go through git and get conflicts #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -122,7 +118,7 @@ module.exports = async function init({
blueprint
});

if (!(reset || init)) {
if (!reset) {
await stageBlueprintFile({
cwd,
emberCliUpdateJsonPath
Expand Down
3 changes: 2 additions & 1 deletion test/acceptance/ember-cli-update-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ describe(function() {
if (init) {
args = [
'init',
`--to=${to}`
`--to=${to}`,
'--resolve-conflicts'
];
}
if (install) {
Expand Down