From c43f900e832e15dd07de4d5d9b654d8325af254f Mon Sep 17 00:00:00 2001 From: Bunyanuch Saengnet Date: Wed, 11 Dec 2019 21:04:59 +0000 Subject: [PATCH] Resolved merge-conflict in ui.js --- source/ui.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/source/ui.js b/source/ui.js index 2e771af3..a89ca702 100644 --- a/source/ui.js +++ b/source/ui.js @@ -70,13 +70,15 @@ module.exports = async (options, pkg) => { const extraBaseUrls = ['gitlab.com']; const repoUrl = pkg.repository && githubUrlFromGit(pkg.repository.url, {extraBaseUrls}); - checkIgnoreStrategy(pkg); - const answerIgnoredFiles = await confirmIgnoredFiles(pkg); - if (!answerIgnoredFiles.confirm) { - return { - ...options, - ...answerIgnoredFiles - }; + if (runPublish) { + checkIgnoreStrategy(pkg); + const answerIgnoredFiles = await confirmIgnoredFiles(pkg); + if (!answerIgnoredFiles.confirm) { + return { + ...options, + ...answerIgnoredFiles + }; + } } console.log(`\nPublish a new version of ${chalk.bold.magenta(pkg.name)} ${chalk.dim(`(current: ${oldVersion})`)}\n`);