Code Collaboration With Git & Stash (and Bamboo)

7,608 views
5,924 views

Published on

Published in: Technology, Self Improvement

Code Collaboration With Git & Stash (and Bamboo)

  1. Code Collaboration with Git + Stash + Bamboo
  2. Sven Peters @svenpet http://svenpet.com Happy Ambassador
  3. Lonesome Cowboy
  4. The trouble starts with the team
  5. It's not your code It's your teams code
  6. C D E T GETHER get help
  7. Bringing code together Sharing code with others Protecting your code C D E T GETHER Your coding workflow!
  8. Bringing code together C D E T GETHER
  9. Branching is cool!
  10. Are you crazy?
  11. MERGE HELL
  12. Branching is cool!
  13. DVCS rocks Git Mercurial
  14. A branch for every issue
  15. Branches have short lives ~ 2 days
  16. What about Continuous Integration ?
  17. Builds set up for the main branch
  18. plan branches
  19. This is not Continuous Integration
  20. Auto merge branches master change feature branch push changes Option #1
  21. Auto merge branches feature branch change master push changes Option #2
  22. Alright, maybe it is :(
  23. Bamboo
  24. C D E T GETHER Sharing code with others
  25. I've written that code. It's faster when I just fix it. Do you have such a team member? I can't tell you how this works. It's too complicated. This is a very sensitive area... You can easily break things
  26. I want to protect my job! Do you have such a team member?
  27. Do you have such a team member? Fire him!
  28. learn better quality feel better blame Why do you want to discuss your code changes?
  29. Discuss your code changes they get merged! before use Pull Requests
  30. use Pull Requests what do you think? create
  31. use Pull Requests what do you think? invite
  32. use Pull Requests what do you think? discuss & approve
  33. use Pull Requests what do you think? merge
  34. use Pull Requests I know @Ben has already written an algorithm for that involve
  35. Dem Time
  36. on Codeis great ! Share and Collaborate
  37. on Code should be easy and fast Share and Collaborate
  38. Simple Workflow Pull Request Branch Merge
  39. Simple Workflow Pull Request Branch Merge No Roles
  40. C D E T GETHER Protecting your code
  41. C D E T GETHER Make sure....
  42. Pull Request Branch Merge No Roles Simple Workflow
  43. Pull Request Branch Merge No Roles Simple Workflow
  44. Pull Request Branch Merge Some Roles Simple Workflow
  45. Branch Permissions
  46. Making sure that the right people can merge code into the right branches #1
  47. Pull Request Merge minimum two approvals Review Rules
  48. Pull Request Merge Review Rules
  49. Making sure that the somebody reviewed the code #2
  50. Pull Request Merge Build Rules
  51. Pull Request Merge Build Rules
  52. Making sure that the build stays green after a merge #3
  53. Project Permissions Project Wonderland Project Fairytale
  54. Making sure that the right people have access #4 to the code they need
  55. Security DevSpeed
  56. The Repo Guard Beware
  57. Can I get a new Repository? Please!
  58. Can I get a new Repository? I'll do in 3 days
  59. Create Repository
  60. Making sure that the development team can move fast #5
  61. Your coding workflow!
  62. Teams are different so are their workflows
  63. Feature Branch Workflow
  64. Fork Workflow
  65. ForkWhat is a ? Makes a copy of a repository on the server No direct pushing to the original remote repository Synch changes from the original remote repository automatic synch can be activated in Stash
  66. ForkWhy a in the enterprise? tweaking libraries innovation spikes protecting components reduce noise interaction with contractors instead of branch permissions
  67. Some people need more
  68. Features 1.
  69. Features 2
  70. Feature 1: Stash Add-ons
  71. Feature 2:
  72. Write a hook! Protect unmerged branch hook you must merge before you delete a branch
  73. Write a hook! Unaprove Reviewer hook new code in a pull request must be reviewed!
  74. Write a hook! Branch from green build hook never branch from a red build
  75. Hooks Add-Ons or download one
  76. see code see issue details see build status
  77. Code On! svenpet.com/slides @svenpet http://svenpet.com

×