Using GitHub to Make Your Life a Whole Lot Easier 👍

---

Introduction

• Git versus GitHub

How does Git work?

http://onlywei.github.io/explain-git-with-d3/#commit

Hands on Basics

1. Git init a repo
2. Clone a repo onto your own machine
3. Make changes on your own machine
4. Save and push to GitHub
5. Hey Bijan, I'm going to work on this now <<<<<<< HEAD
6. Here's another one =======
7. new step

79ec5df553182485455da2588d7ecdfa3f0110f3

Collaborating with Others on GitHub

1. Generally you submit a pull request to a repo that someone else manages

git push origin master

2. But if you are both frequently pushing/pulling and you trust this person to not constantly break your code you can add collaborators so that you can avoid pull requests

How to be a good collaborator (and just good rules in general)

1. Use commit messages that make sense
2. Push often, push always
3. Develop on a dev branch, keep your master branch deployable

But what happens if you mess up?

(E.g. you forget to push or you are editing the same chunk of your code as a collaborator)

A Few More Basics

Ignoring folders (like ones that are too big or have your passwords) via a .gitignore file:

ignore all .a files

*.a

but do track lib.a, even though you're ignoring .a files above

!lib.a

only ignore the TODO file in the current directory, not subdir/TODO

/TODO

ignore all files in any directory named build

build/

ignore doc/notes.txt, but not doc/server/arch.txt

doc/*.txt

ignore all .pdf files in the doc/ directory and any of its subdirectories

*.pdf

What to do when everything goes south....

Erase mistakes and craft replacement history

$ git reset [commit]

Undoes all commits after [commit], preserving changes locally

$ git reset --hard [commit]

if you're not sure?

git stash
git pulling

and when you've decided that you just should have stayed in bed today and not broken your entire code/app

git reset --hard HEAD