git-branching

My 'Dev Time' chat about git branches and how git stores data

Transcript

1. git branching Aaron Chambers @grandazz github.com/achambers
2. Wenguins
3. Noah update
4. - branches - commits - merging - rebasing hopefully I can demystify
5. who uses branches?
6. how do you use branches?
7. why do you use branches?
8. what is a branch?
9. what is a commit?
10. lets step back a bit
11. how does git store data?
12. where is the data stored?
13. $ git add README.md test.rb LICENSE.md blob 96f690... #Testing Library This library is used to test stuff blob 5d6260... module Test module Tester end end blob 32413d... The MIT License
14. $ git commit -m “Initial commit” blob 96f690... #Testing Library This library is used to test stuff blob 5d6260... module Test module Tester end end blob 32413d... The MIT License tree 83890b... blob 32413... LICENESE.md blob 5d626... test.rb blob 96f69... README.md commit 40b5bf... tree 83890b... author Aaron committer Aaron Initial commit
15. what is a commit? a snapshot of your codebase
16. live demo time
17. so what is a branch?
18. a pointer to a commit
19. how does git know which branch you are currently on?
20. HEAD
21. how do we bring the changes from testing into master?
22. fast forward merge
23. lets step it up a notch
24. what happens now?
25. C0 master testing HEAD C1 C2 C3 C4 C5 C6 Common Ancestor Snapshot to merge Snapshot to merge
26. C0 master testing HEAD $ git merge testing C1 C2 C3 C4 C5 C6 C7
27. merge commit
28. pop quiz
29. moar?
30. rebasing
31. summary
32. git stores snapshots of your files as blobs in .git/objects
33. commits are objects that point to a snapshot and store commit metadata
34. branches are just lightweight pointers, pointing to a particular commit
35. branches that point to commits that are upstream from one another can be fast forwarded
36. a merge commit points to two parent commits belonging to the branches that have diverged
37. branching and rebasing are awesome and level up your git workflow.
38. references http://git-scm.com/book/en/Git-Branching http://git-scm.com/book/en/Git-Internals-Git-Objects http://pcottle.github.io/learnGitBranching/ http://wildlyinaccurate.com/a-hackers-guide-to-git
39. topics for another day - squishing commits - git bisect - git workflows - cherry picking - remotes
40. thankyou any questions?