Git and GitHub Workflows

Streamlining your software development workflow is all about decisions. This presentation explores the many options related to version control software, team size, optimization, and command usage.

Transcript

1. Git and GitHub Workflows Information to aid your VCS and branching decisions ! a discussion with Matthew McCullough & Allen Smith
2. matthew@github.com @matthewmccull matthewmccullough !
3. loranallensmith@github.com @loranallensmith loranallensmith !
4. VCS decisions ➊ Optimization decisions ➌ Team decisions ➋ Command decisions ➍
5. software development
6. ➊
7. ➊ "
8. decisions… decisions… decisions… decisions…
9. decisions… decisions… decisions… decisions… Platform Language IDE Process
10. but the initial decisions are…
11. VCS decisions ➊ Optimization ➌ Team ➋ Command ➍
12. basis for other decisions ➊
13. de-centralized centralized
15. easy to use but flexible beyond measure
16. local first but ready to connect
17. 1 team member?
18. 1 to 5 team members?
19. remote connections are easy
20. lightning fast local operations
21. free as in beer
22. ‐‐‑‑‏‎‏‎ ⡤ ⡣
23. Git and GitHub Workflows GitHub Flow Git Flow Rebase It Squash It Linear Fast iterations Git Project Workflow Flow Types Aims Long-lived release branches Maintenance Commands rebase master merge --squash rebase -i commit —amend pull -r bisect Easy regression discovery Developer on boarding Continuous Integration Build all branches Version Control UI Handles rebased branches? Triggers UI updates on merges? Pull Requests Commit keywords: “fixes #22” revert Setting up jobs Push branch to production Chatops Deploying to branches Reverse merges merge master topic Deployments API GitHub Releases API Semantic versioning best practices Teams Solo 1-5 5-15 15-50 50-150 150+ reset --hard reset --soft rebase --autosquash -i GitHub Deployments API Centralized Decentralized ➊
24. branching is cheap
25. ➊ # # # # # # # #
26. Git and GitHub Workflows GitHub Flow Git Flow Rebase It Squash It Linear Fast iterations Git Project Workflow Flow Types Aims Long-lived release branches Maintenance Commands rebase master merge --squash rebase -i commit —amend pull -r bisect Easy regression discovery Developer on boarding Continuous Integration Build all branches Version Control UI Handles rebased branches? Triggers UI updates on merges? Pull Requests Commit keywords: “fixes #22” revert Setting up jobs Push branch to production Chatops Deploying to branches Reverse merges merge master topic Deployments API GitHub Releases API Semantic versioning best practices Teams Solo 1-5 5-15 15-50 50-150 150+ reset --hard reset --soft rebase --autosquash -i GitHub Deployments API Centralized Decentralized ➊
27. ➊ $
28. ➊ "
29. VCS ➊ Optimization ➌ Team decisions ➋ Command ➍
30. how many team members? ➋
31. 1 team member? ➋
33. 1 to 5 team members? ➋
35. 5 to 15 team members? ➋
36. 15 to 50 team members? ➋
37. 50 to 150 team members? ➋
38. 150+ team members? ➋
43. VCS ➊ Optimization decisions ➌ Team ➋ Command ➍
44. optimized for fast iterations? ➌ GitHub Flow
46. master
47. master topic
48. master topic
49. master topic
50. master topic
51. master topic
52. $ ➌
53. optimized for release maintenance? ➌ Git Flow
54. Time release branches master develop hotfixes feature branches Feature for future release Major feature for next release Severe bug fixed for production: hotfix 0.2 Tag 0.1 Tag 0.2 Incorporate bugfix in develop
55. Tag 1.0 From this point on, “next release” means the release after 1.0 Bugfixes from rel. branch may be continuously merged back into develop Only bugfixes! 1.0
56. command line tooling ➌
57. ➌ $
58. optimized for developer on-boarding ➌ atomic flow
59. master
60. master topic
61. master topic
62. master topic
63. master topic
64. master topic
65. ➌ $
66. optimized for clarity & maintenance ➌ git.git gitworkflows
67. ➌
68. maint master next pu ➌
69. ➌ $
70. VCS ➊ Optimization ➌ Team ➋ Command decisions ➍
71. $ git checkout master $ git merge <topic> ➍
72. $ git checkout master $ git merge <topic1> <topic2> ➍
73. $ git revert <SHA> ➍
74. $ git commit --amend ➍
75. $ git rebase -i <SHA> ➍
76. $ git merge --squash <topic> ➍
77. $ git bisect start $ git bisect good $ git bisect bad $ git bisect run $ git bisect log ➍
78. $ git reset --hard ➍
79. communication creativity
80. So what workflow should I chose?
81. mix and match
82. the simplest thing that works
83. matthew@github.com @matthewmccull matthewmccullough !
84. loranallensmith@github.com @loranallensmith loranallensmith !
85. training@github.com training.github.com @githubtraining githubtraining !