Git/GitHub intro level v. next level

[kdmcclin]

We're thinking of planning a git and GitHub workshop sometime this summer and someone brought up the idea of splitting it into what I'm calling intro level (never heard of git/don't know what it is) and next level (somewhat comfortable with basic git, but could use a deeper dive). What would be considered intro versus next level?

To me there are some clear delineations, and some things that could go in either one depending on how we break it down.
Intro:

• difference between git and GitHub (or other such services)
• git init
• git clone
• git pull
• git push
• other git commands necessary for you yourself to work on your own project

Next level:

• git rebase
• git forking and branching workflow (this could go in either one, but it doesn't quite seem like something to bring up to people who have never used git before)
• more things

[kdmcclin]

Note: this is related to #38, but is more about what goes into "next level" rather than intro.

[valeriecodes]

I'd also like to see the "Next level" course also cover git squash, best practices for collaboration on projects with git, submodules, security (e.g. avoiding committing your AWS keys), git clients and their tradeoffs.

[mmlumba]

Other ideas:

Intro:
git remote
setting up ssh keys
.gitgnore file

Next level:
Pull Requests
rewriting history (through rebase, git commit --amend, git reset, etc.)
Github API usage
Handling different types of merge conflicts

I also agree that using Git on your own can be introduction, and anything dealing with collaboration (pull requests, workflows) can be in the next level.

[sirjessthebrave]

Grasshopper: What is git, visually present a tree with branches, set up a hello world repo, and make one commit

Level Up: Setting up a project(init, .gitignore), pushing it up, talking about branches(dev, stage, prod, features), working in a team, pull requests

Keep It Clean: Security, dont commit PWS or API Keys

Sensei Master: Rewriting history, merge conflicts, API usage, squash, stash