Real World Git Workflows

Jazoon 2013 presentation

Transcript

1. Real World Workflows Stefan Saasen
2. TODO Show of hands Picture with hands/lighter/concert
3. git
4. Subversion
5. NO VCS AT ALL? you must love pain
6. Stefan Saasen Atlassian Stash Development Lead I come out nice in pictures, I know :-). @stefansaasen
7. Cheap local branching Full local history Speed Staging area prominent in Open Source Huge community You heard has Superior Merging Much faster than svn Distributed cryptographic integrity
8. ground breaking paradigm is ground breaking
9. Workflow building blocks rebase powerful merging fork efficient clone cheap branching distributed
10. RELEASE Can we fix a bug for a specific ? FEATURE Is the code for that complete? BUILD Can we the current code ? REVIEWED Has everybody the code for this feature ? HOTFIX Can we do a fast for the current release?
11. DIFFERENT PEOPLE PRODUCTS CULTURES
12. DIFFERENT PEOPLE PRODUCTS CULTURES
13. DIFFERENT PEOPLE PRODUCTS CULTURES Stash, Bitbucket, JIRA
14. DIFFERENT PEOPLE PRODUCTS CULTURES DIFFERENT WORKFLOWS
15. 1 Practices & Decisions 2 3 Collaboration model We’ll cover: Branching model Tooling & Automation 4
16. Which collaboration model? 1 Easy, right?
17. Fully decentralized Anarchy I do my thing I do my thing, too ANARCHY here’s mine, who tells john? look ma, a goat!
18. Blessed repository with Gatekeeper He is cool Gatekeeper To have your work accepted, talk to him
19. and Lieutenants Dictator long live the King! Lieutenants guard the King Blessed repository
20. Shared common repository we share “everything” Centralised
21. atlassian.com/git More on Collaboration models
22. + = Centralized Enterprise
23. Builds Metrics Issues Deployments They know where the code needs to go!
24. Which branching model? 2
25. Product Releases 1 Continuous Delivery 2 Two common Branching Models
26. 2.2 for Continuous Delivery
27. Time master/ production staging feature master is in production staging is the next version new features off staging with branch names like: username/ISSUE-KEY-summary promoted from staging, can receive hotfixes Hotfix PR
28. Significant branches map to a concept in the outside world. It may be a past release, an environment or a role. Those branches are long-running and stable whereas feature branches are short lived and volatile. Me, just making this up. ” “
29. for Product Releases 2.1
30. Central Repository 1 One Branch per Feature One Branch per Bugfix 2 3 Time master feature branches PRJ-123-description Time master bugfix branch PRJ-123-bug-description Short lived
31. Release Branches 4 master is alpha / RC 5 Long running Time master release branch PRJ-345-bug-description bugfix 2.2
32. Automatic merges for the win!
33. Time release branch master 2.2 release branch PRJ-345-bug-description bugfix 2.1 Automatic MERGES!
34. Placeholder for changes you DON’T want to merge!
35. release branch 2.2 release branch 2.1 2.1.4 2.2.1 We don’t want to merge the 2.1.x version! 2.1.5-SNAPSHOT What can we do here?
36. git merge git merge --strategy= resolve
37. git merge --strategy= recursive
38. git merge --strategy= ours
39. stable branch 2.2 stable branch 2.1 2.1.4 2.2.1 2.1.5-SNAPSHOT merge commit, content discarded $> git checkout stable-2.2 $> git merge -s ours stable-2.1
40. Deep breath, it’s really simple
41. The merge protocol The secret sauce
42. The merge protocol The secret sauce When a branch is: Change flows from branch to baseline: Change flows from baseline to branch: More stable than its baseline Less stable than its baseline Continually Never When code complete When necessary Release branch Feature branches Credit: Laura Wingerd - The Flow of change
43. The merge protocol The secret sauce Release Branch Master Merge continually Backport single changes using git cherry-pick Never merge!
44. 3 turbo boost! Practices
45. What is a Pull Request?
46. Hey I have some code I want to merge here, take a look? Low friction collaboration Pull Request I have some code here! Can I merge it here?
47. Single Repository vs Remote Forks
48. Every one has their remote repository With Forks Full remote copy, each has one Integrator, Gatekeeper, Tech Lead, etc.
49. Complete visibility 1 No per Dev remotes required KISS 2 3 Pros of a Single Repo All feature branches available
50. Forks Are Great too BTW
51. FORKING IN THE ENTERPRISE
52. FORKING IN THE ENTERPRISE 4 Reasons for... REASON 1 Great for customizing libraries and still get bug fixes
53. REASON 2 Great for innovation spikes and maybe add it later FORKING IN THE ENTERPRISE
54. REASON 3 Protecting your components but still be open for changes FORKING IN THE ENTERPRISE
55. REASON 4 Reduce the noise and keep the overview for huge projects FORKING IN THE ENTERPRISE
56. Tooling & Automation 4
57. Hooks
58. Hooks are little scripts you can place in the `$GIT_DIR/hooks` directory to trigger action at certain points. – githooks Documentation ” “
59. Pre Post
60. Local Remote
61. Local Remote pre-receive update post-receive post-update pre-/post-applypatch pre-/post-commit pre-rebase post-checkout post-merge pre-push
62. Code Quality
63. .git/hooks/pre-commit
64. git add -u git commit -m "TEST checkstyle"
65. Starting audit... /Users/user/[...]/com/atlassian/stash/ web/projects/ProjectController.java: 161:12: 'for' is not followed by whitespace. Audit done. Commit aborted.
66. Branch from green builds
67. .git/hooks/post-checkout
68. $ git checkout master master is lookin'good! c4f3b4b has 4 green builds. $ git checkout stable-2.3 DANGER! stable-2.3 is busted. e1324fa has 2 red builds.
69. Get it at: bitly.com/green-builds
70. What happens to CI with git?
71. 1 An explosion of branches 2 3 Performance degradation of build sys Building everything is expensive
72. Automatically build stable and master 1 Manually trigger feature branch builds 2
73. In Conclusion: the recipe
74. Branching Model Adopt Git Practices Automation & CI setup Conclusions Product workflow Continuous delivery workflow Embrace PR Build automatically, but leave knobs! Single Repo or Forks Collaboration Model Centralized Hooks, hooks everywhere Merge protocol
75. Thank you for your attention! @stefansaasen ssaasen@atlassian.com www.atlassian.com