Handbook

Overview

Learners with no command line experience

1. collaborate on an existing repo using only the github website
2. brief intro to command line
3. start new repo locally and putting it on github
4. practice collaboration on each other's repos

Learners with command line experience

1. collaborate on an existing repo using git locally
2. start new repo locally and putting it on github
3. practice collaboration on each other's repos
4. lightning talks on advanced topics collected throughout

The Plan

Entrance

Check in when you arrive and let us know if you're comfortable with Git on Windows, and if you prefer students who already have command-line experience. The students without command-line experience will have a modified curriculum that will include an introduction to using the command-line.

As learners come in, we will help them with setup if needed and direct them to you. Get to know why they are interested in learning Git, what they do, and what they've heard about Git. Introduce yourself and why you use Git. Once you have about 5 learners, you can begin to lead them through the curriculum.

Curriculum

Collaborate together on your groups' git repo

• ~ 0.5 hrs - 1.5 hrs
• a repo of recipes
  • We will set up a clean repo when you arrive
  • Add your group members as collaborators

Learners with no command line experience

will do this within the GitHub website

Concepts

1. Branching
2. Commiting, and writing commit messages
3. PRs
4. Review, diffing and merging
5. Master branch
6. Issues
7. Merge conflict

• Resolved by mentor while showing learners

Learners with command line experience

will do this in the command line

Concepts

All of the above plus

1. Local vs. remote
2. Cloning
3. Git checkout/branching locally
4. Staging files/git add
5. Pushing
6. Pulling

Start a fresh repo

• ~ 0.5 hrs - 1.5 hrs

Learners with no command line experience

will be introduced to the command line

Command line concepts

1. What is it?
2. Paths
3. Commands

• ls
• mkdir
• pwd
• cd

Git concepts

1. git init
2. Local vs remote
3. git push

Learners with command line experience

will do this in the command line

Concepts

All of the above

Practice collaboration with each other's repos

Pair up and practice the following:

1. Cloning
2. Forking
3. How to add collaborators
4. Resolving merge conflicts

Online and printed versions of a guide will be available. The guide will outline these steps generally and the explanation of concepts will be a conversation between you and your group. Along with the guide, we will have ideas for how you can explain certain concepts, and the initial repo ready for you to use with your group.

Throughout

A whiteboard will be available for people to visit and write down topics/questions for a series of lightning talks at the end.

Potential points of confusion

• not seeing any indication of password being typed at the command line
  • explain that this is normal, and is done to protect the password
• copy and paste in git-bash on windows doesn't work as expected
  • ways to do it
• vi commit
  • we'll avoid this by teaching commit -m
• having to log in all the time from the command line
  • towards the end, you can help the learner set up an ssh key
• thinking commit is the same as push
• we'll break up the two concepts by making a number of commits before pushing