https://github.com/jekyll/jekyll
Revision ed20cb4f900459623bf39d0081a826f3a2939785 authored by ashmaroli on 27 February 2018, 22:29:05 UTC, committed by jekyllbot on 27 February 2018, 22:29:05 UTC
Merge pull request 6801
1 parent 92d491e
Tip revision: ed20cb4f900459623bf39d0081a826f3a2939785 authored by ashmaroli on 27 February 2018, 22:29:05 UTC
Remind user to resolve conflict in `jekyll new` with `--force` (#6801)
Remind user to resolve conflict in `jekyll new` with `--force` (#6801)
Tip revision: ed20cb4
| File | Mode | Size |
|---|---|---|
| .github | ||
| benchmark | ||
| docs | ||
| exe | ||
| features | ||
| lib | ||
| rake | ||
| rubocop | ||
| script | ||
| test | ||
| .codeclimate.yml | -rw-r--r-- | 654 bytes |
| .editorconfig | -rw-r--r-- | 208 bytes |
| .gitignore | -rw-r--r-- | 234 bytes |
| .jrubyrc | -rw-r--r-- | 61 bytes |
| .rubocop.yml | -rw-r--r-- | 3.3 KB |
| .travis.yml | -rw-r--r-- | 1.2 KB |
| CODE_OF_CONDUCT.markdown | -rw-r--r-- | 2.3 KB |
| Gemfile | -rw-r--r-- | 2.4 KB |
| History.markdown | -rw-r--r-- | 137.4 KB |
| LICENSE | -rw-r--r-- | 1.1 KB |
| README.markdown | -rw-r--r-- | 3.9 KB |
| Rakefile | -rw-r--r-- | 3.8 KB |
| appveyor.yml | -rw-r--r-- | 941 bytes |
| jekyll.gemspec | -rw-r--r-- | 2.0 KB |
Computing file changes ...
