Code Collaboration With Git & Stash (and Bamboo)
•
9 likes•13,371 views
This document discusses code collaboration using Git and Stash with Bamboo for continuous integration. It promotes using pull requests and branches for code changes with review and approval processes. Simple workflows are shown using pull requests, branches and merges with no specific roles. Additional features discussed include repository permissions, security, and development speed. Custom hooks and addons are presented as ways to further protect code and enforce processes. The overall message is how these tools can help teams code together effectively.
Recommended
More Related Content
What's hot
What's hot (18)
Viewers also liked
Viewers also liked (20)
Similar to Code Collaboration With Git & Stash (and Bamboo)
Similar to Code Collaboration With Git & Stash (and Bamboo) (20)
More from Sven Peters
More from Sven Peters (14)
Recently uploaded
Recently uploaded (20)
Code Collaboration With Git & Stash (and Bamboo)
- 1. Code Collaboration with Git + Stash + Bamboo
- 4. The trouble starts with the team
- 5. It's not your code It's your teams code
- 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
- 10. Are you crazy?
- 11. MERGE HELL
- 14. A branch for every issue
- 15. Branches have short lives ~ 2 days
- 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
- 37. on Codeis great ! Share and Collaborate
- 38. on Code should be easy and fast Share and Collaborate
- 41. C D E T GETHER Protecting your code
- 47. Making sure that the right people can merge code into the right branches #1
- 50. Making sure that the somebody reviewed the code #2
- 53. Making sure that the build stays green after a merge #3
- 55. Making sure that the right people have access #4 to the code they need
- 58. Can I get a new Repository? Please!
- 59. Can I get a new Repository? I'll do in 3 days
- 61. Making sure that the development team can move fast #5
- 63. Teams are different so are their workflows
- 65. Fork Workflow
- 66. 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
- 67. ForkWhy a in the enterprise? tweaking libraries innovation spikes protecting components reduce noise interaction with contractors instead of branch permissions
- 69. Features 1.
- 70. Features 2
- 72. Feature 2:
- 73. Write a hook! Protect unmerged branch hook you must merge before you delete a branch
- 74. Write a hook! Unaprove Reviewer hook new code in a pull request must be reviewed!
- 75. Write a hook! Branch from green build hook never branch from a red build
- 77. see code see issue details see build status