Skip to content

Commit 17db6e3

Browse files
githubteachergithubteacher
committed
Repository for merge conflict course
0 parents  commit 17db6e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+3775
-0
lines changed

‎.bundle/config

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
BUNDLE_PATH: "_vendor/bundle"
3+
BUNDLE_DISABLE_SHARED_GEMS: "true"

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
_site
2+
.sass-cache
3+
.DS_Store
4+
_vendor

‎Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gem 'github-pages'

‎Gemfile.lock

+204
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
activesupport (4.2.8)
5+
i18n (~> 0.7)
6+
minitest (~> 5.1)
7+
thread_safe (~> 0.3, >= 0.3.4)
8+
tzinfo (~> 1.1)
9+
addressable (2.5.1)
10+
public_suffix (~> 2.0, >= 2.0.2)
11+
coffee-script (2.4.1)
12+
coffee-script-source
13+
execjs
14+
coffee-script-source (1.12.2)
15+
colorator (1.1.0)
16+
ethon (0.10.1)
17+
ffi (>= 1.3.0)
18+
execjs (2.7.0)
19+
faraday (0.12.2)
20+
multipart-post (>= 1.2, < 3)
21+
ffi (1.9.18)
22+
forwardable-extended (2.6.0)
23+
gemoji (3.0.0)
24+
github-pages (150)
25+
activesupport (= 4.2.8)
26+
github-pages-health-check (= 1.3.5)
27+
jekyll (= 3.5.1)
28+
jekyll-avatar (= 0.4.2)
29+
jekyll-coffeescript (= 1.0.1)
30+
jekyll-default-layout (= 0.1.4)
31+
jekyll-feed (= 0.9.2)
32+
jekyll-gist (= 1.4.1)
33+
jekyll-github-metadata (= 2.6.0)
34+
jekyll-mentions (= 1.2.0)
35+
jekyll-optional-front-matter (= 0.2.0)
36+
jekyll-paginate (= 1.1.0)
37+
jekyll-readme-index (= 0.1.0)
38+
jekyll-redirect-from (= 0.12.1)
39+
jekyll-relative-links (= 0.4.1)
40+
jekyll-sass-converter (= 1.5.0)
41+
jekyll-seo-tag (= 2.2.3)
42+
jekyll-sitemap (= 1.0.0)
43+
jekyll-swiss (= 0.4.0)
44+
jekyll-theme-architect (= 0.0.4)
45+
jekyll-theme-cayman (= 0.0.4)
46+
jekyll-theme-dinky (= 0.0.4)
47+
jekyll-theme-hacker (= 0.0.4)
48+
jekyll-theme-leap-day (= 0.0.4)
49+
jekyll-theme-merlot (= 0.0.4)
50+
jekyll-theme-midnight (= 0.0.4)
51+
jekyll-theme-minimal (= 0.0.4)
52+
jekyll-theme-modernist (= 0.0.4)
53+
jekyll-theme-primer (= 0.4.0)
54+
jekyll-theme-slate (= 0.0.4)
55+
jekyll-theme-tactile (= 0.0.4)
56+
jekyll-theme-time-machine (= 0.0.4)
57+
jekyll-titles-from-headings (= 0.4.0)
58+
jemoji (= 0.8.0)
59+
kramdown (= 1.13.2)
60+
liquid (= 4.0.0)
61+
listen (= 3.0.6)
62+
mercenary (~> 0.3)
63+
minima (= 2.1.1)
64+
rouge (= 1.11.1)
65+
terminal-table (~> 1.4)
66+
github-pages-health-check (1.3.5)
67+
addressable (~> 2.3)
68+
net-dns (~> 0.8)
69+
octokit (~> 4.0)
70+
public_suffix (~> 2.0)
71+
typhoeus (~> 0.7)
72+
html-pipeline (2.6.0)
73+
activesupport (>= 2)
74+
nokogiri (>= 1.4)
75+
i18n (0.8.6)
76+
jekyll (3.5.1)
77+
addressable (~> 2.4)
78+
colorator (~> 1.0)
79+
jekyll-sass-converter (~> 1.0)
80+
jekyll-watch (~> 1.1)
81+
kramdown (~> 1.3)
82+
liquid (~> 4.0)
83+
mercenary (~> 0.3.3)
84+
pathutil (~> 0.9)
85+
rouge (~> 1.7)
86+
safe_yaml (~> 1.0)
87+
jekyll-avatar (0.4.2)
88+
jekyll (~> 3.0)
89+
jekyll-coffeescript (1.0.1)
90+
coffee-script (~> 2.2)
91+
jekyll-default-layout (0.1.4)
92+
jekyll (~> 3.0)
93+
jekyll-feed (0.9.2)
94+
jekyll (~> 3.3)
95+
jekyll-gist (1.4.1)
96+
octokit (~> 4.2)
97+
jekyll-github-metadata (2.6.0)
98+
jekyll (~> 3.1)
99+
octokit (~> 4.0, != 4.4.0)
100+
jekyll-mentions (1.2.0)
101+
activesupport (~> 4.0)
102+
html-pipeline (~> 2.3)
103+
jekyll (~> 3.0)
104+
jekyll-optional-front-matter (0.2.0)
105+
jekyll (~> 3.0)
106+
jekyll-paginate (1.1.0)
107+
jekyll-readme-index (0.1.0)
108+
jekyll (~> 3.0)
109+
jekyll-redirect-from (0.12.1)
110+
jekyll (~> 3.3)
111+
jekyll-relative-links (0.4.1)
112+
jekyll (~> 3.3)
113+
jekyll-sass-converter (1.5.0)
114+
sass (~> 3.4)
115+
jekyll-seo-tag (2.2.3)
116+
jekyll (~> 3.3)
117+
jekyll-sitemap (1.0.0)
118+
jekyll (~> 3.3)
119+
jekyll-swiss (0.4.0)
120+
jekyll-theme-architect (0.0.4)
121+
jekyll (~> 3.3)
122+
jekyll-theme-cayman (0.0.4)
123+
jekyll (~> 3.3)
124+
jekyll-theme-dinky (0.0.4)
125+
jekyll (~> 3.3)
126+
jekyll-theme-hacker (0.0.4)
127+
jekyll (~> 3.3)
128+
jekyll-theme-leap-day (0.0.4)
129+
jekyll (~> 3.3)
130+
jekyll-theme-merlot (0.0.4)
131+
jekyll (~> 3.3)
132+
jekyll-theme-midnight (0.0.4)
133+
jekyll (~> 3.3)
134+
jekyll-theme-minimal (0.0.4)
135+
jekyll (~> 3.3)
136+
jekyll-theme-modernist (0.0.4)
137+
jekyll (~> 3.3)
138+
jekyll-theme-primer (0.4.0)
139+
jekyll (~> 3.5)
140+
jekyll-seo-tag (~> 2.2)
141+
jekyll-theme-slate (0.0.4)
142+
jekyll (~> 3.3)
143+
jekyll-theme-tactile (0.0.4)
144+
jekyll (~> 3.3)
145+
jekyll-theme-time-machine (0.0.4)
146+
jekyll (~> 3.3)
147+
jekyll-titles-from-headings (0.4.0)
148+
jekyll (~> 3.3)
149+
jekyll-watch (1.5.0)
150+
listen (~> 3.0, < 3.1)
151+
jemoji (0.8.0)
152+
activesupport (~> 4.0)
153+
gemoji (~> 3.0)
154+
html-pipeline (~> 2.2)
155+
jekyll (>= 3.0)
156+
kramdown (1.13.2)
157+
liquid (4.0.0)
158+
listen (3.0.6)
159+
rb-fsevent (>= 0.9.3)
160+
rb-inotify (>= 0.9.7)
161+
mercenary (0.3.6)
162+
mini_portile2 (2.2.0)
163+
minima (2.1.1)
164+
jekyll (~> 3.3)
165+
minitest (5.10.3)
166+
multipart-post (2.0.0)
167+
net-dns (0.8.0)
168+
nokogiri (1.8.0)
169+
mini_portile2 (~> 2.2.0)
170+
octokit (4.7.0)
171+
sawyer (~> 0.8.0, >= 0.5.3)
172+
pathutil (0.14.0)
173+
forwardable-extended (~> 2.6)
174+
public_suffix (2.0.5)
175+
rb-fsevent (0.10.2)
176+
rb-inotify (0.9.10)
177+
ffi (>= 0.5.0, < 2)
178+
rouge (1.11.1)
179+
safe_yaml (1.0.4)
180+
sass (3.5.1)
181+
sass-listen (~> 4.0.0)
182+
sass-listen (4.0.0)
183+
rb-fsevent (~> 0.9, >= 0.9.4)
184+
rb-inotify (~> 0.9, >= 0.9.7)
185+
sawyer (0.8.1)
186+
addressable (>= 2.3.5, < 2.6)
187+
faraday (~> 0.8, < 1.0)
188+
terminal-table (1.8.0)
189+
unicode-display_width (~> 1.1, >= 1.1.1)
190+
thread_safe (0.3.6)
191+
typhoeus (0.8.0)
192+
ethon (>= 0.8.0)
193+
tzinfo (1.2.3)
194+
thread_safe (~> 0.1)
195+
unicode-display_width (1.3.0)
196+
197+
PLATFORMS
198+
ruby
199+
200+
DEPENDENCIES
201+
github-pages
202+
203+
BUNDLED WITH
204+
1.14.3

‎LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Joel Glovier
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

‎README.md

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# On Demand Merge Conflict Course
2+
3+
*An introduction to merge conflicts that creates a simple Jekyll + GitHub Pages based on jglovier's [resume template](https://github.com/jglovier/resume-template/).*
4+
5+
![img](images/screenshot.png)
6+
7+
## Docs
8+
9+
### Running locally
10+
11+
To test locally, run the following in your terminal:
12+
13+
1. Clone repo locally
14+
1. `bundle install`
15+
2. `bundle exec jekyll serve`
16+
3. Open your browser to `localhost:4000`
17+
18+
### Customizing
19+
20+
First you'll want to fork the repo to your own account. Then clone it locally and customize, or use the GitHub web editor to customize.
21+
22+
#### Options/configuration
23+
24+
Most of the basic customization will take place in the `/_config.yml` file. Here is a list of customizations available via `/_config.yml`:
25+
26+
[...write these out...]
27+
28+
#### Editing content
29+
30+
Most of the content configuration will take place in the `/_layouts/resume.html` file. Simply edit the markup there accordingly
31+
32+
### Publishing to GitHub Pages for free
33+
34+
[GitHub Pages](https://pages.github.com/) will host this for free with your GitHub account. Just make sure you're using a `gh-pages` branch, and the site will automatically be available at `yourusername.github.io/resume-template` (you can rename the repo to resume for your own use if you want it to be available at `yourusername.github.io/resume`). You can also add a CNAME if you want it to be available at a custom domain...
35+
36+
### Configuring with your own domain name
37+
38+
To setup your GH Pages site with a custom domain, [follow the instructions](https://help.github.com/articles/setting-up-a-custom-domain-with-github-pages/) on the GitHub Help site for that topic.
39+
40+
### Themes
41+
42+
Right now resume-template only has one theme. More are coming :soon: though. :heart:
43+
44+
## Roadmap
45+
46+
A feature roadmap is [available here](https://github.com/jglovier/resume-template/projects/1). If you features suggestions, please [open a new issue](https://github.com/jglovier/resume-template/issues/new).
47+
48+
## Contributing
49+
50+
To contribute to the development of the On Demand course, visit the On Demand [repository](https://github.com/github/training-kit/).
51+
To contribute to the resume template, visit the Resume Template [repository](https://github.com/jglovier/resume-template/).
52+
53+
## License
54+
55+
The code and styles are licensed under the MIT license. [See project license.](LICENSE) Obviously you should not use the content of this demo repo in your own resume. :wink:

0 commit comments

Comments
 (0)