Don't Fear the Branch - Marcus Bertrand

1. #atlassian

2. Don’t Fear the Branch Branching workflows used in Bitbucket and Stash MARCUS BERTRAND • BITBUCKET DEVELOPER • @MARCUSBERTRAND

3. You should be using branches

4. You should be using branches WHY YOU AREN’T ANATOMY OF A BRANCH WHY GIT

5. Too complex

6. No visibility

7. Merging is difficult

9. Anatomy of a branch

10. commit Anatomy of a branch

11. .git/objects/49/42f87f225899b15b9f1c1ebe6a4e61663b8568 commit 197^@tree 274192fecfeda9ec03d7ab6cd64d5bc22b2cfb8b author Marcus Bertrand <mbertrand@atlassian.com> 1408988361 -0700 committer Marcus Bertrand <mbertrand@atlassian.com> 1408988361 -0700 ! Added a readme commit Anatomy of a branch

20. .git/objects/49/42f87f225899b15b9f1c1ebe6a4e61663b8568 commit 197^@tree 274192fecfeda9ec03d7ab6cd64d5bc22b2cfb8b author Marcus Bertrand <mbertrand@atlassian.com> 1408988361 -0700 committer Marcus Bertrand <mbertrand@atlassian.com> 1408988361 -0700 ! Added a readme commit Anatomy of a branch .git/objects/27/4192fecfeda9ec03d7ab6cd64d5bc22b2cfb8b tree 100644 blob d30480027f7ef61af129b07a21bae8d0ea13eb2a README.md

23. .git/objects/49/42f87f225899b15b9f1c1ebe6a4e61663b8568 commit 197^@tree 274192fecfeda9ec03d7ab6cd64d5bc22b2cfb8b author Marcus Bertrand <mbertrand@atlassian.com> 1408988361 -0700 committer Marcus Bertrand <mbertrand@atlassian.com> 1408988361 -0700 ! Added a readme commit Anatomy of a branch .git/objects/27/4192fecfeda9ec03d7ab6cd64d5bc22b2cfb8b tree 100644 blob d30480027f7ef61af129b07a21bae8d0ea13eb2a README.md .git/objects/d3/0480027f7ef61af129b07a21bae8d0ea13eb2a blob 21^@====== Readme ====== blob

26. Anatomy of a branch 4942f87 commit

27. Anatomy of a branch 4942f87

28. Anatomy of a branch 4942f87 .git/refs/heads/master branch 4942f87f225899b15b9f1c1ebe6a4e61663b8568

29. Anatomy of a branch 4942f87 .git/refs/heads/master branch 4942f87f225899b15b9f1c1ebe6a4e61663b8568 .git/HEAD head ref: refs/heads/master

30. Anatomy of a branch git checkout -b foo/mybranch

31. Anatomy of a branch 4942f87 .git/refs/heads/foo/mybranch branch 4942f87f225899b15b9f1c1ebe6a4e61663b8568 .git/HEAD head ref: refs/heads/foo/mybranch

32. Anatomy of a branch .git/objects/49/42f87f225899b15b9f1c1ebe6a4e61663b8568 tree 9441d4ef753148ce9cb5aee3966fa6e4f5366be5 parent 4942f87f225899b15b9f1c1ebe6a4e61663b8568 author Marcus Bertrand <mbertrand@atlassian.com> 1408992616 -0700 committer Marcus Bertrand <mbertrand@atlassian.com> 1408992616 -0700 ! Made some edits to the readme commit

33. Anatomy of a branch .git/objects/49/42f87f225899b15b9f1c1ebe6a4e61663b8568 tree 9441d4ef753148ce9cb5aee3966fa6e4f5366be5 parent 4942f87f225899b15b9f1c1ebe6a4e61663b8568 author Marcus Bertrand <mbertrand@atlassian.com> 1408992616 -0700 committer Marcus Bertrand <mbertrand@atlassian.com> 1408992616 -0700 ! Made some edits to the readme commit

34. Anatomy of a branch 4942f87 bd1174c .git/refs/heads/foo/mybranch branch bd1174cd0f30fe9be9efdd41dcd56256340f230e .git/HEAD head ref: refs/heads/foo/mybranch

35. Anatomy of a branch HEAD master foo/mybranch 4942f87 bd1174c

36. Anatomy of a branch git checkout master

37. Anatomy of a branch master HEAD foo/mybranch

38. Anatomy of a branch master foo/mybranch

39. Anatomy of a branch master foo/mybranch HEAD

40. Anatomy of a branch git merge foo/mybranch

41. Anatomy of a branch foo/mybranch HEAD master

42. Anatomy of a branch foo/mybranch M HEAD master

43. Anatomy of a branch foo/mybranch M

44. Anatomy of a branch foo/mybranch HEAD master M

45. Anatomy of a branch .git/objects/36/80d8c8fd182f97cb0e75045e2fed5c7b7613ed tree f362c42032aff677c1a09c3f070454df5b411239 parent 49a906f5722ad446a131778cea52e3fda331b706 parent bd1174cd0f30fe9be9efdd41dcd56256340f230e author Marcus Bertrand <mbertrand@atlassian.com> 1409002123 -0700 committer Marcus Bertrand <mbertrand@atlassian.com> 1409002123 -0700 ! Merge branch 'foo/mybranch' commit

46. Anatomy of a branch .git/objects/36/80d8c8fd182f97cb0e75045e2fed5c7b7613ed tree f362c42032aff677c1a09c3f070454df5b411239 parent 49a906f5722ad446a131778cea52e3fda331b706 parent bd1174cd0f30fe9be9efdd41dcd56256340f230e author Marcus Bertrand <mbertrand@atlassian.com> 1409002123 -0700 committer Marcus Bertrand <mbertrand@atlassian.com> 1409002123 -0700 ! Merge branch 'foo/mybranch' commit

47. Anatomy of a branch HEAD master M foo/mybranch

49. Every commit is a full copy of the repository state at that revision

50. Everything is local

51. Merging is simple

52. Better workflows

54. The Stash Team • 2 Product Managers • 1 Architect • 1 Designer • 2 QA • 2 Team Leads • Support, Tech Writing, Product Marketing & more! • 30 Developers on 3 teams • Red - Backend • Blue - Front end • Enterprise!

55. Git Flow

56. Git Flow master

57. Git Flow master feature/JRA-123

58. Git Flow master develop M feature/JRA-123

59. Git Flow master develop M M feature/JRA-123

60. Git Flow master develop M release/1.0 M feature/JRA-123

61. Git Flow master develop M release/1.0 M feature/JRA-123 1.0

62. Git Flow - bugfix

63. Git Flow - bugfix release/1.0

64. Git Flow - bugfix release/1.0 bugfix/JRA-200

65. Git Flow - bugfix M 1.1 release/1.0 bugfix/JRA-200

66. Git Flow - bugfix release/2.0 M 2.1 M 1.1 release/1.0 bugfix/JRA-200

67. Git Flow - bugfix master M release/2.0 M 2.1 M 1.1 release/1.0 bugfix/JRA-200

68. Stash flow master

69. JIRA

70. Create Branch

71. Stash flow master

72. Stash flow master feature/STASHDEV07369…

73. Open a Pull Request

74. Stash flow master feature/STASHDEV07369… M

75. Wait for the master build

76. Stash flow master feature/STASHDEV07369… M

77. Stash flow master feature/STASHDEV07369… M release/1.0

78. Release manager

79. Stash flow master feature/STASHDEV07369…

80. Stash flow master feature/STASHDEV07369… release/3.2 3.2

81. Stash flow master feature/STASHDEV07369… release/3.2 3.2 M

82. Everyone is happy!

83. Almost

84. JIRA

85. Stash flow master M release/3.1 M release/3.0 M bugfix/STAHDEV-123

86. Branch configuration

90. The Bitbucket Team • 2 Product Managers • 1 Architect • 1 Designer • 1QA • 3 Team Leads • Support, Tech Writing, Product Marketing & more! • 1 TL and 3 Operations • 15 Developers on 2 teams in Austin and San Francisco • Backend • Front end !

91. Branch per feature

92. Branchper bug

93. Branch per hot fix

94. Branch

95. Branch per feature stage_20140827… staging M

96. Branch per feature stage_20140827… staging M mbertrand/BB-123

97. Branch per feature stage_20140826… M stage_20140827… staging M mbertrand/BB-123

98. Branch per feature production M stage_20140826… M prod_20140826… stage_20140827… staging M mbertrand/BB-123

99. Branch per feature production

100. Branch per feature production mbertrand/BB-123

101. Pull request

102. Comments

103. Branch per feature production staging M mbertrand/BB-123 jmoo/BB-400 M

104. HipChat for Deployments

105. Branch per bug fix staging M

106. Branch per bug fix production M staging M

107. Branch per bug fix production M staging M HOTFIX-BB-500

108. Branch per bug fix production M staging M M HOTFIX-BB-500

109. Branch per bug fix production M M staging M M HOTFIX-BB-500

111. When things go wrong

112. What did I just merge?

113. Don’t panic

114. Unmerge

115. $ git revert {SHA1}

116. Mysteries

117. $ git log --all --stat --graph --parents

118. $ git show --pretty=raw --stat c102ec5

119. Branching==safety

120. Git branching==Freedom

121. Small changes==great success

122. atlassian.com/git

123. Thank you! MARCUS BERTRAND • BITBUCKET DEVELOPER • @MARCUSBERTRAND

Don't Fear the Branch - Marcus Bertrand

Recommended

Recommended

More Related Content

Similar to Don't Fear the Branch - Marcus Bertrand

Similar to Don't Fear the Branch - Marcus Bertrand (20)

More from Atlassian

More from Atlassian (20)

Recently uploaded

Recently uploaded (20)

Don't Fear the Branch - Marcus Bertrand