Git & GitHub

	Google Docs	Git

Google Docs

Git

	git log
	git revert
	git blame

Google Docs	Git
	Clone	git clone <url>
	Pull	git pull
	Commit	git commit -m "..."
	Push	git push
	Fork

Google Docs

Git

Google Docs	Git / GitHub

Pull Request

Code Review

Merge

Google Docs

Git

<<<<<<< yours ======= >>>>>>> theirs

| Name | Fun Fact | |------|----------| <<<<<<< HEAD | Ana | I love hiking | ======= | Ana | I love surfing | >>>>>>> origin/main

| Ana | I love hiking and surfing |

	git pull
	git checkout -b my-feature
	git add . && git commit -m "..."
	git push + PR
	git checkout main && git pull

Cheat Sheet

git clone <url> —
git pull —

git add . —
git commit -m "msg" —
git push —

git checkout -b name —
git checkout main —
git push -u origin name —

git status —
git log --oneline —
git diff —