Skip to content

Commit

Permalink
Resolved merge-conflict in ui.js
Browse files Browse the repository at this point in the history
  • Loading branch information
bunysae committed Dec 11, 2019
1 parent 5bb7561 commit c43f900
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions source/ui.js
Expand Up @@ -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`);
Expand Down

0 comments on commit c43f900

Please sign in to comment.