570 likes | 1.03k Views
Coding is simple and great if it's just you working on the code. It is getting much more complex when a whole team or even several teams are working on the code base. You want to be sure, that everybody knows about code changes, the quality is the same all over the code base and a merge shouldn't stop the whole team from working. Atlassian's tools can help you out. <br><br>This presentation shows how you can use Stash and Bamboo to happily code together in a team. You don't have to worry about broken builds on your master branch or that your graduate accidentally merges his changes that get automatic deployed. Everybody understands each part of the code base and the code got reviewed before it hits your master branch.
E N D
Sven Peters Happy Ambassador @svenpet http://svenpet.com
Life as a Hacker is great !
Simple Workflow! writing code committing code
Simple dependencies! stops just you ... so what? writing breaking code fixing code code code
Code Quality like code
The trouble starts with the team
Life as a Team Coder
Multiple changes! writing merging code changing code code code
Rely on each other! stops the team writing breaking code fixing code code fast code
Code Quality! writing reviewing code code Opinion Opinion Opinion
It's not your code It's your team's code
get help C D E T GETHER
C T GETHER D E Bringing code together Sharing code with others Protecting your code
C T GETHER D E Bringing code together
Branching is cool!
MERGE HELL
everybody stops to work until merge is done Merge Fear Disease afraid that the build will fail waiting until the code is done done
A branch for every task
Branches have short lives ~ 2 days
DVCS rocks Git Mercurial
find out! Will the build fail if I would merge now? ... and stop the rest of the team!
C T GETHER D E Sharing code with others
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
Do you have such a team member? I want to protect my job!
Do you have such a team member? him! Fire
feel better Learn Discuss your code changes Better quality
use Pul Requests Discuss your code changes before they get merged!
use Pul Requests create what do you think?
use Pul Requests invite what do you think?
use Pul Requests discuss & approve what do you think?
use Pul Requests merge what do you think?
use Pul Requests involve I know @Ben has already written an algorithm for that
Dem Time
Share and Collaborate on Code is great !
Share and Collaborate on Code should be easy and fast
Simple Workflow Merge Pull Request Branch
Simple Workflow No Roles Merge Pull Request Branch
C T GETHER D E Protecting your code
Simple Workflow No Roles Merge Pull Request Branch
Simple Workflow No Roles Merge Pull Request Branch
Simple Workflow Some Roles Merge Pull Request Branch
Do you want your graduates merge into the automatic deploy branch?