Understanding Git and a Standard Workflow

This is a talk I gave at LiveRail as an initiation to Git and the standard Git workflow.

Transcript

1. Travis Vocino
 Product Designer travis@liverail.com
2. • Local vs. Remote • Stage, Commit, Push • Stashing • Branching • Merging Workflow
3. sourcetreeapp.com
4. Local vs. Remote
5. Local clone gives you a local copy of a repository Remote Branches Commits Tags Local Branches Commits Tags $ git clone git://git.liverail.com/admanager-sdk
6. Local vs. Remote clone gives you a local copy of a repository Remote Branches Commits Tags Local Branches Commits Tags $ git clone git://git.liverail.com/admanager-sdk nearly every operation is now working off of local data — insanely fast your workflow does not have a single point of failure — distributed insanely awesome incredible workflows — awesome
7. Local commits, branches, and tags can all exist locally and/or remotely Local Remote master ✔ ✔ feature/create_dashboard ✔ ✔ feature/add_menu_item_x ✔ feature/change_header_color ✔ $ git checkout feature/create_dashboard
8. Local you can name remotes and have more than one .git/config Name Description origin The default (where you cloned from) upstream Often used if you need to track commits from outside of your team.
 A javascript library on Github is needed but LiveRail must make changes to it. 
 The source Github repo would be the upstream and LiveRail’s hosted repo would be origin. staging Used to sync with a staging or QA server.
9. Local $ git pull upstream dev git push pull origin staging prod master dev feature/new_css feature/update_class prod $ action remotes branches
10. Local working with remotes like a boss $ git push prod master you can push things from local to a remote $ git fetch upstream you can fetch a remote $ git pull origin master you can pull changes from a remote to local pull is fetch+merge
11. Stage, Commit, Push
12. Stage, Commit, Push staging a file is putting it on deck to commit Commit styles.css index.html Push styles.css index.html Stage styles.css index.html
13. Stage, Commit, Push staging a file is putting it on deck to commit Stage styles.css Commit styles.css index.html Push styles.css index.html index.html
14. Stage, Commit, Push committing a file is putting it on deck to push Stage styles.css index.html Commit styles.css index.html Push styles.css index.html
15. Stage, Commit, Push committing a file is putting it on deck to push Stage styles.css index.html Commit styles.css index.html Push styles.css index.html app.js framework.js app.js framework.js app.js framework.js
16. Branching
17. Branching A B B
18. Branching A B B Always Be Branching BRANCHING
19. Branching A B B Always Be Branching BRANCHING local branches give you the freedom to experiment they let you separate and organize different directions they can have special and meaningful names to you
20. Branching branching like a boss $ git checkout my-awesome-branch checkout an existing local or remote branch $ git checkout -b my-new-branch create a new branch with the same command $ git branch -d my-unused-branch kill branches you don’t care about
21. Stashing
22. Stashing $ git stash
23. Stashing stashing is like a temporary commit Branch A style.css index.html app.js $ git stash Stash style.css index.html app.js Branch Y style.css index.html app.js
24. Stashing stashing is like a temporary commit Branch A style.css index.html app.js $ git stash Stash style.css index.html app.js Branch Y style.css index.html app.js stashing grabs the dirty state of your working directory your stash is saved in a stack that can be reapplied helpful before a merge or to quickly address a bug fix
25. Merging
26. Merging merging brings one branch’s changes into your branch Your Branch style.css index.html app.js $ git merge your-branch My Branch style.css index.html app.js always that into this
27. Merging Your Branch style.css index.html app.js My Branch style.css index.html app.js My Branch* style.css index.html app.js CONFLICT merging brings one branch’s changes into your branch always that into this $ git merge your-branch
28. Merging resolving merge conflicts in plain text 1 stuff we both agree on 2 stuff we both agree on <<<<<<< my-branch-name 3 stuff I have 4 stuff I have ======= 3 stuff you have 4 stuff you have >>>>>>> your-branch-name 5 stuff we both agree on 6 stuff we both agree on
29. Merging resolving merge conflicts in plain text 1 stuff we both agree on 2 stuff we both agree on <<<<<<< my-branch-name 3 stuff I have 4 stuff I have ======= 3 stuff you have 4 stuff you have >>>>>>> your-branch-name 5 stuff we both agree on 6 stuff we both agree on
30. Merging resolving merge conflicts in plain text 1 stuff we both agree on 2 stuff we both agree on <<<<<<< my-branch-name 3 stuff I have 4 stuff I have ======= 3 stuff you have 4 stuff you have >>>>>>> your-branch-name 5 stuff we both agree on 6 stuff we both agree on
31. Merging resolving merge conflicts in plain text 1 stuff we both agree on 2 stuff we both agree on <<<<<<< my-branch-name 3 stuff I have 4 stuff I have ======= 3 stuff you have 4 stuff you have 5 stuff we both agree on 6 stuff we both agree on >>>>>>> your-branch-name
32. Merging resolving merge conflicts in plain text 1 stuff we both agree on 2 stuff we both agree on 5 stuff we both agree on 6 stuff we both agree on 3 stuff you have 4 stuff you have
33. Workflow
34. Workflow Feature Branching Workflow Forking Workflow
35. Workflow Feature Branching Workflow Forking gitflow
36. Workflow TIME master hotfixes release
 branches develop feature
 branches
37. TIME master hotfixes release
 branches develop feature
 branches Workflow 1.0
38. TIME master hotfixes release
 branches develop feature
 branches Workflow
39. TIME master hotfixes release
 branches develop feature
 branches Workflow 1.0 1.1 Hotfix for 1.0, push to 1.1
40. TIME master hotfixes release
 branches develop feature
 branches Workflow 1.0 1.1 2.0b
41. TIME master hotfixes release
 branches develop feature
 branches Workflow 1.0 1.1 2.0b b.1 b.2
42. TIME master hotfixes release
 branches develop feature
 branches Workflow 1.0 1.1 2.0
43. TIME master hotfixes release
 branches develop feature
 branches Workflow 1.0 1.1 2.0 3.0
44. Questions?