1 / 50

Git Branching for Agile Teams

Moving to Git opens up a whole new level of agility for software teams. Freed from the clunky code freezes and monolithic mega-merges that plague centralized version control, developers can isolate work in progress and build in narrow vertical slices with ease. Branching is so painless with Git that many teams are making new branches for each user story or bug fix they implement. This model is quickly becoming the new gold standard for agile teams – and for good reason!

svenpet
Download Presentation

Git Branching for Agile Teams

An Image/Link below is provided (as is) to download presentation Download Policy: Content on the Website is provided to you AS IS for your information and personal use and may not be sold / licensed / shared on other websites without getting consent from its author. Content is provided to you AS IS for your information and personal use only. Download presentation by click this link. While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server. During download, if you can't get a presentation, the file might be deleted by the publisher.

E N D

Presentation Transcript

  1. Git Branching for Agile Teams moar ^ Helping agile teams be awesome @svenpet

  2. Guten Morgen Sven Peters ? Atlassian Ambassador & Geek @svenpet

  3. Housekeeping Submit Qs for A! 1 Smile, we’re on camera. 2 Tweet to #code4acause 3

  4. Agenda Git + agile = BFFs 1 Branching models for agile teams 2 Incorporating best practices 3 Trade-offs to consider 4

  5. Why Git + Agile?

  6. 1 Build in narrow vertical slices “big bang” launch MVP launch TESTING TESTING FRONT END FRONT END BACK END BACK END DATABASE DATABASE Time

  7. Build in narrow vertical slices potentially shippable, even without this piece I have a roof!

  8. 2 Make releases a non-event just a few dependencies...

  9. Make releases a non-event

  10. Chaos! I do my thing, too I do my thing look Ma, a goat!

  11. Hoarding

  12. Isn‘t it ironic?

  13. A Few Words About Git

  14. everybody stops work until merge is done In Subversion Branching & merging is hell afraid that the build will fail waiting until implementation is done

  15. In Git Branching & merging is a breeze

  16. Branch-per-Issue Workflow

  17. Keep the main line clean dev branch = isolation chamber

  18. Clarity & traceability

  19. Branch-per-Issue Workflow for SaaS teams

  20. A branch for every issue fortunately, no goats here master sgd-IRKD-30 sgd-IRKD-45

  21. A branch for every issue master sgd-IRKD-30 sgd-IRKD-30 God-like admin rights optional

  22. A branch for every issue master sgd-IRKD-30

  23. A branch for every issue master sgd-IRKD-30

  24. A branch for every issue master sgd-IRKD-30 gatekeeper

  25. A branch for every issue still no goats!

  26. Using an Integration Branch

  27. Surprise! master sgd-IRKD-30 sgd-IRKD-45

  28. Using an integration branch master integration sgd-IRKD-30 sgd-IRKD-45

  29. Using an integration branch master integration sgd-IRKD-30 sgd-IRKD-45

  30. Branch-per-Issue Workflow for installed app teams

  31. Multiple-version support v 1.1 v 1.2 master sgd-IRKD-30

  32. Multiple-version support v 1.1 v 1.2 master sgd-IRKD-31 sgd-IRKD-30

  33. Multiple-version support bugfix- v 1.1 IRKD-32 v 1.2 master sgd-IRKD-30

  34. Multiple-version support bugfix-IRKD-32 v 1.1 v 1.2 master

  35. The Way Atlassian Multiple-version support manually automatically v 1.1 v 1.2 master https:/ /bitbucket.org/durdn/automatic-merge-hook

  36. Continuous Integration & Peer Review

  37. Running CI on dev branches all active branches are under test

  38. Running CI on dev branches bitbucket.org/tpettersen/git-ci-hooks Clone master’s CI configs 1 Jenkins plugin or Git hook 2 3

  39. Running CI on dev branches

  40. Running CI on dev branches v 1.2 master sgd-IRKD-30

  41. Peer code review Create request via UI or git request-pull 1 Review, revise, rinse & repeat 2 Approve & merge 3

  42. Peer code review

  43. Additional Considerations

  44. It’s not “pure CI” beware of goats

  45. Dark features

  46. Q & A

  47. More info at... http://atlassian.com/git 1 @Atlassian 2

  48. #code4acause

  49. THANKS Sven Peters ? Atlassian Ambassador & Geek @svenpet

More Related