dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Merge pull request 6801
This commit is contained in:
ashmaroli 2018-02-28 03:59:05 +05:30 committed by jekyllbot
parent 92d491ea13
commit ed20cb4f90
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/jekyll/commands/new.rb
View File

@ -27,8 +27,9 @@ module Jekyll
new_blog_path = File.expand_path(args.join(" "), Dir.pwd) new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
FileUtils.mkdir_p new_blog_path FileUtils.mkdir_p new_blog_path
if preserve_source_location?(new_blog_path, options) if preserve_source_location?(new_blog_path, options)
Jekyll.logger.abort_with "Conflict:", Jekyll.logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
"#{new_blog_path} exists and is not empty." Jekyll.logger.abort_with "", "Ensure #{new_blog_path} is empty or else " \
"try again with `--force` to proceed and overwrite any files."
end end
if options["blank"] if options["blank"]