Stash - We Code Together

Preview:

DESCRIPTION

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. 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.

Citation preview

We C de T gether

Sven Peters

@svenpethttp://svenpet.com

Happy Ambassador

Lifeis great !

as aHacker

codewritingcommitting code

Simple Workflow!

codewritingbreaking code

fixing codecode

Simple dependencies!stops just you ... so what?

Code Quality

codelike

Lonesome Cowboy

The trouble startswith the team

Lifeas a

TeamCoder

codewritingmerging code

changing codecode

Multiple changes!

codewritingbreaking code

fixing codecode

Rely on each other!

fast

stops the team

codewritingreviewing code

Code Quality!

Opinion

OpinionOpinion

It's not your code

It's your team's code

C

DE

T GETHERget help

Bringing code together

Sharing code with others

Protecting your code

C

DE

T GETHER

Bringing code together

C

DE

T GETHER

Branching is cool!

MERGE

HELL

Merge FearDisease

everybody stops to work until merge is done

waiting until the code is done done

afraid that the build will fail

A branch for every task

Branches have short lives

~ 2 days

DVCS rocks

GitMercurial

Will the build failif I would merge now?

... and stop the rest of the team!

find out!

find out!

plan branches

virtual commit

Bamboo

C

DE

T GETHER

Sharing code with others

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

I want to protectmy job!

Do you have such a team member?

Do you have such a team member?

Firehim!

Discuss your code changes

Learn

Better quality

feel better

Discuss your code changes

they get merged!before

use Pu" Requests

use Pu" Requests

what do you think?

create

use Pu" Requests

what do you think?

invite

use Pu" Requests

what do you think?

discuss & approve

use Pu" Requests

what do you think?

merge

use Pu" Requests

I know @Ben has already written an algorithm for that

involve

Dem Time

on Codeis great !

Share and Collaborate

on Codeshould be easy and fast

Share and Collaborate

Simple Workflow

Pull Request

Branch

Merge

Simple Workflow

Pull Request

Branch

Merge

No Roles

C

DE

T GETHER

Protecting your code

Pull Request

Branch

Merge

No RolesSimple Workflow

Pull Request

Branch

Merge

No RolesSimple Workflow

Pull Request

Branch

Merge

Some RolesSimple Workflow

Do you want your graduates

merge into the automatic deploy branch?

Branch Permissions

Project Permissions

ProjectWonderland Project

Fairytale

Security DevSpeed

The Repo GuardBeware

Can I get a new Repository?

Please!

Can I get a new Repository?

I'll do in 3 days

Create Repository

C

DE

T GETHER