Skip to content

Commit c1edcfe

Browse files
Cynthia RichCynthia Rich
Cynthia Rich
authored and
Cynthia Rich
committed
resolving merge conflict in advanced modules
2 parents 272e355 + 7846b75 commit c1edcfe

File tree

286 files changed

+7090
-3964
lines changed

Some content is hidden

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

286 files changed

+7090
-3964
lines changed

‎README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,33 @@ We know that part of effectively sharing GitHub and Git with the world goes beyo
88

99
We know that many of the users of this repository are just focused on getting the materials and teaching from them. We've made that easy.
1010

11-
1. You can view and teach from the kit, hosted on GitHub, at http://training.github.com/kit
11+
1. You can view and teach from the kit, hosted on GitHub, at https://services.github.com/kit/
1212
2. You can download an offline copy of the kit via the green button at https://github.com/github/training-kit/releases
1313

1414

1515
## Contribute
1616

17-
We’re eager to have your help in improving this kit. If you have an idea for a change, start by opening a new [Issue](https://github.com/github/training-kit/issues) so we can discuss and help guide your contribution to the right ___location. If you have corrections or kit contributions, we'd be glad to receive them via a [Pull Request](https://help.github.com/articles/using-pull-requests). For kit contributions, we ask you to share in our mindset of minimalism. We aim to keep the workbook and slides a synchronized pair.
17+
We’re eager to have your help in improving this kit. If you have an idea for a change, start by opening a new [Issue](https://github.com/github/training-kit/issues) so we can discuss and help guide your contribution to the right ___location. If you have corrections or kit contributions, we'd be glad to receive them via a [Pull Request](https://help.github.com/articles/using-pull-requests). For kit contributions, we ask you to share in our mindset of minimalism.
1818

19-
The educational content exists in two top level directories:
19+
The slides align with the [Foundations](https://github.com/github/training-kit/tree/master/foundations/index.md), [Intermediate](https://github.com/github/training-kit/blob/master/intermediate/index.md), and [Advanced](https://github.com/github/training-kit/tree/master/advanced/index.md) classes delivered by the GitHub Training team.
2020

21-
1. [`slides`](https://github.com/github/training-kit/tree/master/slides)
22-
2. [`workbooks`](https://github.com/github/training-kit/tree/master/workbooks)
21+
The three class' slides reside at top-level directories:
22+
23+
- [`foundations/`](https://github.com/github/training-kit/tree/master/foundations)
24+
- [`intermediate/`](https://github.com/github/training-kit/tree/master/intermediate)
25+
- [`advanced/`](https://github.com/github/training-kit/tree/master/advanced)
2326

2427

2528
## File Format
2629

27-
The majority of the site materials are written in [Markdown](http://whatismarkdown.com), a [lightweight markup language](http://en.wikipedia.org/wiki/Lightweight_markup_language) supported in the GitHub web application user interface. There is a syntax guide to the original [Markdown format](http://daringfireball.net/projects/markdown/syntax) and also [GitHub Flavored Markdown](http://github.github.com/github-flavored-markdown/). This repository is based on [Hydeslides](https://github.com/jordanmccullough/HydeSlides). That project offers additional information on the file and directory structure.
30+
The class materials are written in [Markdown](http://whatismarkdown.com), a [lightweight markup language](http://en.wikipedia.org/wiki/Lightweight_markup_language) supported in the GitHub web application user interface. There is a syntax guide to the original [Markdown format](http://daringfireball.net/projects/markdown/syntax) and also [GitHub Flavored Markdown](http://github.github.com/github-flavored-markdown/).
31+
32+
The class material content possess two specialized uses of Markdown for slide-like rendering and formatting:
33+
34+
- Full-screen slides are preceded with a `---` and followed by `---`
35+
- Step-by-step *lab* sections are wrapped with `{% capture lab %}` and `{% endcapture %}{% include lab %}`
36+
37+
This repository is based on [Hydeslides](https://github.com/jordanmccullough/HydeSlides). That project offers additional information on the file and directory structure.
2838

2939
## Build
3040

‎_buildscripts/import-curriculum.rb

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#!/bin/ruby
2+
3+
begin
4+
require 'git'
5+
rescue LoadError
6+
puts "\n#{'=' * 52}\nOops...\nIt looks like you don't have the git gem installed.\n\You can install it using: `gem install git`.\nThen try running `jekyll serve` again.\n#{'=' * 52}\n\n"
7+
exit
8+
end
9+
10+
FileUtils.mkdir('_modules') unless File.directory?('_modules')
11+
FileUtils.mkdir('_courses') unless File.directory?('_courses')
12+
FileUtils.mkdir('images') unless File.directory?('images')
13+
14+
def out_with_the_old(directory)
15+
16+
puts "Removing old #{directory.sub('_', '')}..."
17+
18+
Dir.foreach(directory) do | file |
19+
20+
# Skip directory listings
21+
next if file == '.' or file == '..'
22+
filepath = "#{directory}/#{file}"
23+
File.delete(filepath)
24+
25+
end
26+
27+
end
28+
29+
30+
def in_with_the_new(directory)
31+
32+
Dir.foreach("curriculum-github/#{directory}") do | file |
33+
34+
# Only import pertinent file types
35+
next unless ['.jpg', '.png', '.gif', '.yml'].include?(File.extname(file))
36+
37+
puts "Importing #{file}..."
38+
39+
if File.extname(file) != '.yml'
40+
41+
# File is an image. Move it to the images directory
42+
FileUtils.cp "curriculum-github/images/#{file}", "images/#{file}"
43+
44+
else
45+
46+
# We have a .yml file.
47+
# Read contents of current .yml file
48+
yml = File.open("curriculum-github/#{directory}/#{file}").read
49+
50+
# Write .yml file contents to .md file with necessary frontmatter
51+
md = File.new("_#{directory}/#{File.basename(file, '.yml')}.md", "w")
52+
md.write("---\nlayout: #{directory.chomp('s')}\nleadingpath: ../\n#{yml}\n---")
53+
md.close
54+
end
55+
end
56+
end
57+
58+
# Clear out old content
59+
out_with_the_old('_modules')
60+
out_with_the_old('_courses')
61+
62+
# Clone curriculum-github repository from Certify org
63+
puts "Cloning curriculum-github repository from Certify organization..."
64+
repo = Git.clone('https://github.com/certify/curriculum-github', 'curriculum-github')
65+
66+
# Import the fresh content from the repository
67+
in_with_the_new('modules')
68+
in_with_the_new('courses')
69+
in_with_the_new('images')
70+
71+
# Remove local curriculum-github repository
72+
FileUtils.rm_rf("curriculum-github")

‎_buildscripts/theme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
for STYLES in page home workbook
22
do
3-
echo "- Generating $STYLES"
4-
sass --style compressed _stylesheets/$STYLES.scss _stylesheets/$STYLES.css
3+
echo "- Generating $STYLES"
4+
sass --style compressed _stylesheets/$STYLES.scss _stylesheets/$STYLES.css
55
done
66
echo "Completed SASS compiling and CSS compression!"

‎_config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ title: GitHub Training
66

77
# standard jekyll configuration
88

9+
baseurl: /kit
910
permalink: /articles/:title
1011
highlighter: pygments
1112
exclude:
@@ -20,6 +21,12 @@ exclude:
2021
- script
2122
- vendor
2223

24+
collections:
25+
modules:
26+
output: true
27+
courses:
28+
output: true
29+
2330
include:
2431
- _stylesheets
2532
- _javascript

‎_courses/github-for-developers.md

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
---
2+
layout: course
3+
leadingpath: ../
4+
title: GitHub for Developers
5+
description: A tour through Git and GitHub concepts for those who use the command line.
6+
7+
sections:
8+
-
9+
title: Getting Started with Collaboration
10+
description: This section introduces you to GitHub and the collaboration features we will use throughout the class.
11+
modules:
12+
- COLL-00_Introducing-github
13+
- COLL-01_Exploring-a-repository
14+
- COLL-02_Using-issues
15+
-
16+
title: Creating Your First Pull Request
17+
description: In this section you will learn about the GitHub flow and create your first pull request.
18+
modules:
19+
- CONT-01_Understanding-github-flow
20+
- CONT-02_Using-branches
21+
- CONT-030_Creating-files-platform
22+
- CONT-035_Creating-pull-requests
23+
- POLL-01_Pace-poll-01
24+
- CONT-04_Editing-pull-request-files
25+
- CONT-05_Merging-pull-requests
26+
-
27+
title: Using GitHub Locally
28+
description: In this section you will learn how to clone the repository to your desktop and work locally to make changes.
29+
modules:
30+
- CONT-CLI-01_Basic-Configuration
31+
- CONT-CLI-02_Cloning-repository
32+
- CONT-CLI-03_Editing-local-files
33+
- CONT-CLI-04_Two_Stage_Commit
34+
- CONT-CLI-05_Sync-changes
35+
-
36+
title: The Workflow End-to-End
37+
description: In this section you will review the workflow from start-to-finish and learn a few shortcuts along the way.
38+
modules:
39+
- CONT-CLI-06_Creating-repository-github
40+
- CONT-CLI-07_Creating-local-branches
41+
- CONT-CLI-08_Workflow-review
42+
- CONT-CLI-09_Pulling-changes
43+
- POLL-02_Pace-poll-02
44+
-
45+
title: Working with Local Files
46+
description: In this section you will learn how to perform common file operations with git.
47+
modules:
48+
- CONT-CLI-10_Modifying-local-files
49+
- CONT-CLI-11_Viewing-local-diffs
50+
- CONT-CLI-12_Merging-changes
51+
- CONT-CLI-13_Viewing-project-history
52+
-
53+
title: Fixing Common Issues with Git
54+
description: In this section you will learn how to manipulate your repository and its history to craft a better story for your project.
55+
modules:
56+
- CONT-CLI-14_Creating-repository-local
57+
- CONT-CLI-21_Handling-merge-conflicts
58+
- CONT-CLI-15_Renaming-moving-files
59+
- CONT-CLI-16_Reverting-commits
60+
- CONT-CLI-17_Fixing-bad-commits
61+
- POLL-03_Pace-poll-03
62+
- CONT-CLI-18_Unstaging-files
63+
- CONT-CLI-19_Resetting-history
64+
- CONT-CLI-20_Discarding-changes-modified-files
65+
- CONT-CLI-22_Removing-tracked-files
66+
-
67+
title: Creating Shortcuts
68+
description: In this section you will learn how to create custom shortcuts for git commands.
69+
modules:
70+
- CONT-CLI-23_Creating-aliases
71+
72+
---

‎_courses/github-for-everyone.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
layout: course
3+
leadingpath: ../
4+
title: GitHub for Everyone
5+
description: An introduction to GitHub for those who prefer the web browser and graphical clients.
6+
7+
sections:
8+
-
9+
title: Getting Started with Collaboration
10+
description: This section introduces you to GitHub and the collaboration features we will use throughout the class.
11+
modules:
12+
- COLL-00_Introducing-github
13+
- COLL-01_Exploring-a-repository
14+
- COLL-02_Using-issues
15+
- COLL-03_Watching-notifications-stars-explore
16+
-
17+
title: Creating Your First Pull Request
18+
description: In this section you will learn about the GitHub flow and create your first pull request.
19+
modules:
20+
- CONT-01_Understanding-github-flow
21+
- CONT-02_Using-branches
22+
- CONT-030_Creating-files-platform
23+
- CONT-035_Creating-pull-requests
24+
- POLL-01_Pace-poll-01
25+
- CONT-04_Editing-pull-request-files
26+
- CONT-05_Merging-pull-requests
27+
-
28+
title: Using the GitHub Desktop Application
29+
description: In this section you will learn how to clone the repository to your desktop and work locally to make changes.
30+
modules:
31+
- CONT-GHM-01_Basic-Configuration
32+
- CONT-GHM-02_Cloning-repository
33+
- CONT-GHM-03_Editing-local-files
34+
- CONT-GHM-04_Two_Stage_Commit
35+
- CONT-GHM-05_Sync-changes
36+
-
37+
title: Managing Projects on GitHub
38+
description: In this section you will learn about the project management features in GitHub.
39+
modules:
40+
- PROJ-01_Managing-issues-pull-requests
41+
- PROJ-02_Using-milestones
42+
- PROJ-03_Using-pulse-graphs
43+
44+
---

‎_includes/hydeslides/impressjs/slidedeck

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
<div id="impress">
22

3-
{% assign xPos = 0 %}
4-
{% assign coverRotate = 90 %}
3+
{% assign xPos = 0 %}
4+
{% assign coverRotate = 90 %}
55

6-
{% for ch in page.chapters %}
6+
{% for ch in page.chapters %}
77

8-
{% assign yPos = 0 %}
9-
{% assign zIndex = 0 %}
8+
{% assign yPos = 0 %}
9+
{% assign zIndex = 0 %}
1010

11-
{% for section in site.tags[ch] reversed %}
12-
13-
{% if forloop.first %}
14-
{% if section.cover == false %}{% else %}
15-
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-scale="2" data-rotate="{{ coverRotate }}" id="{{ section.chapter | downcase | replace:" ","-" }}">
16-
<h1 class="cover-title">{{ section.chapter }}</h1>
17-
</div>
18-
{% capture yPos %}
19-
{{ yPos | plus: 4000 }}
20-
{% endcapture %}
11+
{% for section in site.tags[ch] reversed %}
12+
13+
{% if forloop.first %}
14+
{% if section.cover == false %}{% else %}
15+
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-scale="2" data-rotate="{{ coverRotate }}" id="{{ section.chapter | downcase | replace:" ","-" }}">
16+
<h1 class="cover-title">{{ section.chapter }}</h1>
17+
</div>
18+
{% capture yPos %}
19+
{{ yPos | plus: 4000 }}
20+
{% endcapture %}
2121

22-
{% endif %}
22+
{% endif %}
2323

24-
{% endif %}
24+
{% endif %}
2525

26-
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-z="{{ zIndex }}" id="{{ section.title | downcase | replace:" ","-" }}">
27-
<h1 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.chapter }}</h1>
28-
<h2 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.title }}</h2>
29-
<div class="clear-all"></div>
30-
{{ section.content }}
31-
</div>
26+
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-z="{{ zIndex }}" id="{{ section.title | downcase | replace:" ","-" }}">
27+
<h1 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.chapter }}</h1>
28+
<h2 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.title }}</h2>
29+
<div class="clear-all"></div>
30+
{{ section.content }}
31+
</div>
3232

33-
{% capture zIndex %}
34-
{{ zIndex | plus: -300}}
35-
{% endcapture %}
33+
{% capture zIndex %}
34+
{{ zIndex | plus: -300}}
35+
{% endcapture %}
3636

37-
{% capture yPos %}
38-
{{ yPos | plus: 1000 }}
39-
{% endcapture %}
37+
{% capture yPos %}
38+
{{ yPos | plus: 1000 }}
39+
{% endcapture %}
4040

41-
{% endfor %}
41+
{% endfor %}
4242

43-
{% capture xPos %}
44-
{{ xPos | plus: 2000 }}
45-
{% endcapture %}
43+
{% capture xPos %}
44+
{{ xPos | plus: 2000 }}
45+
{% endcapture %}
4646

47-
{% endfor %}
47+
{% endfor %}
4848
</div>

‎_includes/hydeslides/revealjs/head

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<!-- If the query includes 'print-pdf', use the PDF print sheet -->
1111
<script>
12-
document.write( '<link rel="stylesheet" href="dependencies/revealjs/css/print/' + ( window.___location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
12+
document.write( '<link rel="stylesheet" href="dependencies/revealjs/css/print/' + ( window.___location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
1313
</script>
1414

1515
<!--[if lt IE 9]>
@@ -21,7 +21,7 @@
2121

2222
<!--GitHub Style-->
2323
{% if page.theme %}
24-
{% assign theme = page.theme %}
24+
{% assign theme = page.theme %}
2525
{% else %}
26-
{% assign theme = "original" %}
26+
{% assign theme = "original" %}
2727
{% endif %}

0 commit comments

Comments
 (0)