1 / 78

Code Collaboration With Git & Stash (and Bamboo)

Slideshow about Code Collaboration With Git & Stash (and Bamboo)

svenpet
Download Presentation

Code Collaboration With Git & Stash (and Bamboo)

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. Code Collaboration with Git + Stash + Bambo

  2. Sven Peters Happy Ambassador @svenpet http://svenpet.com

  3. Lonesome Cowboy

  4. The trouble starts with the team

  5. It's not your code It's your teams code

  6. get help C D E T GETHER

  7. C T GETHER D E Bringing code together Sharing code with others Protecting your code Your coding workflow!

  8. C T GETHER D E Bringing code together

  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 Option #1 change master feature branch push changes

  21. Auto merge branches Option #2 change feature branch master push changes

  22. Alright, maybe it is :(

  23. Bamboo

  24. C T GETHER D E Sharing code with others

  25. Do you have such a team member? I've written that code. It's faster when I just fix it. I can't tell you how this works. It's too complicated. This is a very sensitive area... You can easily break things

  26. Do you have such a team member? I want to protect my job!

  27. Do you have such a team member? him! Fire

  28. feel better learn better quality blame Why do you want to discuss your code changes?

  29. use Pul Requests Discuss your code changes before they get merged!

  30. use Pul Requests create what do you think?

  31. use Pul Requests invite what do you think?

  32. use Pul Requests discuss & approve what do you think?

  33. use Pul Requests merge what do you think?

  34. use Pul Requests involve I know @Ben has already written an algorithm for that

  35. Dem Time

  36. Share and Collaborate on Code is great !

  37. Share and Collaborate on Code should be easy and fast

  38. Simple Workflow Merge Pull Request Branch

  39. Simple Workflow No Roles Merge Pull Request Branch

  40. C T GETHER D E Protecting your code

  41. C T GETHER D E Make sure....

  42. Simple Workflow No Roles Merge Pull Request Branch

  43. Simple Workflow No Roles Merge Pull Request Branch

  44. Simple Workflow Some Roles Merge Pull Request Branch

  45. BranchPermissions

  46. #1 Making sure that theright peoplecan merge code into theright branches

  47. ReviewRules minimum two aprovals Merge Pull Request

  48. ReviewRules Merge Pull Request

  49. #2 Making sure that thesomebodyreviewed the code

More Related