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.

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

Remind user to resolve conflict in `jekyll new` with `--force` #6801

Merged
merged 2 commits into from Feb 27, 2018

Conversation

Projects
None yet
5 participants
@ashmaroli
Member

ashmaroli commented Feb 25, 2018

@ashmaroli ashmaroli added this to the v3.8.0 milestone Feb 25, 2018

Jekyll.logger.abort_with "Conflict:",
"#{new_blog_path} exists and is not empty."
Jekyll.logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
Jekyll.logger.abort_with "", "Use '--force' to overwrite and create anyway."

This comment has been minimized.

@oe

oe Feb 25, 2018

Member

I'm not sure about this wording. Can we make it a bit less forceful? Using --force shouldn't be recommended as the default option.

This comment has been minimized.

@ashmaroli

ashmaroli Feb 25, 2018

Member

bit less forceful?

haha..

Using --force shouldn't be recommended as the default option.

"Ensure the #{new_blog_path} is empty or else try again with `--force`
to proceed and overwrite any files"
@DirtyF

DirtyF approved these changes Feb 25, 2018

@DirtyF

This comment has been minimized.

Member

DirtyF commented Feb 27, 2018

@jekyllbot: merge +minor

@jekyllbot jekyllbot merged commit ed20cb4 into jekyll:master Feb 27, 2018

3 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ashmaroli ashmaroli deleted the ashmaroli:better-force-msg branch Feb 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment