Skip to content
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

ashmaroli
Copy link
Member

@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."
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member

DirtyF commented Feb 27, 2018

@jekyllbot: merge +minor

@jekyllbot jekyllbot merged commit ed20cb4 into jekyll:master Feb 27, 2018
jekyllbot added a commit that referenced this pull request Feb 27, 2018
@ashmaroli ashmaroli deleted the better-force-msg branch February 28, 2018 03:32
@jekyll jekyll locked and limited conversation to collaborators Jul 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants