Git/Github Workshop

1. git clone from GH, url: https://github.com/kmanzana/git_github_workshop
2. git add, commit, push to master
3. push to branch
4. create PR
5. merge PR
6. fork OS repo

and:

• handling merge conflicts
• merge vs rebase
• ashley is awesome
• git push origin HEAD:branch vs
  git push origin branch:branch vs
  git push origin branch vs
  git push