Now you're gitting it

A talk on how git & GitHub works, with a little live demo to show it all off

Transcript

1. Now you’re gitting it! With git and GitHub
2. @CaptainWalters captainwalters.github.io CaptainWalters Oliver Walters
3. What is Version Control?
4. Version Control System (VCS) Tracks progress over time v0.1 v0.2 v.03 v0.4 v1.0
5. Snapshots of your work • Snapshots are a history of your work • Allows others to keep up- to-date with the latest work
6. What is git?
7. Git Vs GitHub Git: • Distributed version control software GitHub: • Online storage and access for git
8. Why use VCS?
9. Versioning
10. Rewinding! • Breaking the project isn’t the end of the world • Rewind to when it worked
11. Other Teamwork options?
12. Centralised systems • Require coordination • Active network connection • Automatic saving & versioning
13. Distributed systems • Keep track of versions without coordination • Editing offline doesn’t cause issues • User defined snapshots
14. How does it work?
15. Keeping up-to-date Stored Locally Stored on GitHub
16. Local View
17. Unmodified This file is identical to the information stored in the current commit Staged File is ready to be committed (but can still be worked on) File States Modified There are differences between this file and the one of the same name in the current commit Untracked There is no copy of this file stored in the repository logs
18. Basic commands • git init {repo_name} • git add {filename} • git reset {filename} • git commit -m “<comment>” • git status • git log
19. Network commands • git clone {repo url} • git push [-u origin {branch_name}] • git fetch • git pull • git remote add origin {url}
20. Branching commands • git branch • git checkout [-b] {branch_name} • git merge {branch_name} • git rebase
21. Advanced commands • git reset [--soft/hard] {commit_reference} • git tag [-a] {version_name} [-m “<comment>”] • git reflog
22. Merge Conflicts?
23. What is a Pull Request?
24. Resources • Student developer pack – https://education.github.com/pack • Learn about git - https://git-scm.com/about/ • GitHub windows GUI - https://desktop.github.com/ • Give git and GitHub a try - https://try.github.io • How and why you should make good commit messages - https://chris.beams.io/posts/git-commit/ • If you’ve really messed up - http://ohshitgit.com/
25. Thank you @CaptainWalters