GIT Onboarding

GitHub Flow is a lightweight, branch-based workflow that supports teams and projects where deployments are made regularly. This guide explains how and why GitHub Flow works.

Transcript

1. Onboarding 2015/10/16 @acactown
2. Disclaimer ! Disclaimer !
3. Disclaimer !
4. Disclaimer !
5. Question !
6. Rules !
7. Rules ! - If you have any questions, please feel free to ask! - Teams… by Country! - Each team has at least two developers… - Boring talk... then demo! - Demo... then challenge! - Every developer has an ID! - Incremental challenges… Final!
8. Award!
9. Now ...
10. Now ! Branching & Merging Strategy
11. VCS
12. VCS
13. Remember: all I'm offering is the truth. Nothing more.
14. GIT
15. Working Directory
16. $git init .git
17. $git init .git
18. Three "trees" .git
19. Workflow .git working directory
20. Workflow .git working directory ignore
21. Workflow .git working directory ignore
22. .git working directory ignore $git add staging
23. .git working directory ignore $git commit staging local repository
24. Few words...
25. Demo!!!111!!!
26. Useful commands #!/usr/bin/env bash mkdir working-directory cd working-directory git init git status git config --global user.name "Andrés Amado" git config --global user.email andres.amado@neoway.com.br git config --global core.editor vim git config --global merge.tool meld git config --list vim .gitignore git add .gitignore git commit -m 'Add .gitignore' vim README.md git add .gitignore README.md git commit -m 'Add README file' git log
27. Remote repository
28. Demo!!!111!!!
29. Remote repository
30. Demo!!!111!!!
31. Useful commands #!/usr/bin/env bash # Developer A git remote add origin git@gitlab-onboarding.neoway.com.br... git remote -v git push -u origin master # Developer B git clone git@gitlab-onboarding.neoway.com.br... my-working-directory cd my-working-directory git remote -v git config user.name "Andrés Amado" git config user.email andres.amado@neoway.com.br git pull origin master vim README.md git commit -am 'Update README file adding Andrés as contributor' git push origin master
32. Rule
33. Rule
34. Branching Use other branches for development and merge them back to the master branch upon completion. Branches are used to develop features isolated from each other.
35. Branching
36. Demo!!!111!!!
37. Useful commands #!/usr/bin/env bash # Developer A git pull origin master git checkout -b add-colombia-team-thumbnails git branch mkdir thumbnails git status git add thumbnails git commit -m 'Add Colombia contributors thumbs' git fetch origin git pull origin master git push origin add-colombia-team-thumbnails git checkout master git pull origin master git checkout -b add-colombia-team-flag git push origin add-colombia-team-flag # Developer B git fetch origin git checkout --track origin/add-colombia-team-flag mkdir flags git add flags git commit -m 'Add Colombia team flag' git pull origin master git pull origin add-colombia-team-flag git push origin add-colombia-team-flag
38. Github Flow Create Branch
39. Github Flow Add Commits
40. Github Flow Merge Request
41. Github Flow Code Review
42. Github Flow Approve Deploy
43. Github Flow Merge Close
44. Demo!!!111!!!
45. Useful commands #!/usr/bin/env bash # Developer A git checkout master git pull origin master git checkout -b add-api-structure git commit -m 'Fix #1, Add base project API structure' git pull origin master git push origin add-api-structure git branch -D add-api-structure # Developer B git checkout master git pull origin master git checkout -b add-model-layer git commit -m 'Fix #2, Add API model layer' git pull origin master git push origin add-model-layer git branch -D add-api-structure # Developer C git checkout master git pull origin master git checkout -b move-assets git mv flags/ client/ git mv thumbnails/ client/ git commit -m 'Move assets to API front-end static file path' git pull origin master git push origin move-assets git branch -D move-assets
46. It's all about choices...
47. GIT Onboarding 2015/10/16