Remind user to resolve conflict in `jekyll new` with `--force` (#6801)
Merge pull request 6801
This commit is contained in:
		
							parent
							
								
									92d491ea13
								
							
						
					
					
						commit
						ed20cb4f90
					
				|  | @ -27,8 +27,9 @@ module Jekyll | |||
|           new_blog_path = File.expand_path(args.join(" "), Dir.pwd) | ||||
|           FileUtils.mkdir_p new_blog_path | ||||
|           if preserve_source_location?(new_blog_path, options) | ||||
|             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 "", "Ensure #{new_blog_path} is empty or else " \ | ||||
|                       "try again with `--force` to proceed and overwrite any files." | ||||
|           end | ||||
| 
 | ||||
|           if options["blank"] | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue