stash - we code together

57
We C de T gether

Post on 21-Oct-2014

2.716 views

Category:

Technology


1 download

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.

TRANSCRIPT

Page 1: Stash - We Code Together

We C de T gether

Page 2: Stash - We Code Together

Sven Peters

@svenpethttp://svenpet.com

Happy Ambassador

Page 3: Stash - We Code Together

Lifeis great !

as aHacker

Page 4: Stash - We Code Together

codewritingcommitting code

Simple Workflow!

Page 5: Stash - We Code Together

codewritingbreaking code

fixing codecode

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

Page 6: Stash - We Code Together

Code Quality

codelike

Page 7: Stash - We Code Together

Lonesome Cowboy

Page 8: Stash - We Code Together

The trouble startswith the team

Page 9: Stash - We Code Together

Lifeas a

TeamCoder

Page 10: Stash - We Code Together

codewritingmerging code

changing codecode

Multiple changes!

Page 11: Stash - We Code Together

codewritingbreaking code

fixing codecode

Rely on each other!

fast

stops the team

Page 12: Stash - We Code Together

codewritingreviewing code

Code Quality!

Opinion

OpinionOpinion

Page 13: Stash - We Code Together

It's not your code

It's your team's code

Page 14: Stash - We Code Together

C

DE

T GETHERget help

Page 15: Stash - We Code Together

Bringing code together

Sharing code with others

Protecting your code

C

DE

T GETHER

Page 16: Stash - We Code Together

Bringing code together

C

DE

T GETHER

Page 17: Stash - We Code Together

Branching is cool!

Page 18: Stash - We Code Together

MERGE

HELL

Page 19: Stash - We Code Together

Merge FearDisease

everybody stops to work until merge is done

waiting until the code is done done

afraid that the build will fail

Page 20: Stash - We Code Together

A branch for every task

Page 21: Stash - We Code Together

Branches have short lives

~ 2 days

Page 22: Stash - We Code Together

DVCS rocks

GitMercurial

Page 23: Stash - We Code Together

Will the build failif I would merge now?

... and stop the rest of the team!

find out!

Page 24: Stash - We Code Together

find out!

Page 25: Stash - We Code Together

plan branches

Page 26: Stash - We Code Together

virtual commit

Page 27: Stash - We Code Together

Bamboo

Page 28: Stash - We Code Together

C

DE

T GETHER

Sharing code with others

Page 29: Stash - We Code Together

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

Page 30: Stash - We Code Together

I want to protectmy job!

Do you have such a team member?

Page 31: Stash - We Code Together

Do you have such a team member?

Firehim!

Page 32: Stash - We Code Together

Discuss your code changes

Learn

Better quality

feel better

Page 33: Stash - We Code Together

Discuss your code changes

they get merged!before

use Pu" Requests

Page 34: Stash - We Code Together

use Pu" Requests

what do you think?

create

Page 35: Stash - We Code Together

use Pu" Requests

what do you think?

invite

Page 36: Stash - We Code Together

use Pu" Requests

what do you think?

discuss & approve

Page 37: Stash - We Code Together

use Pu" Requests

what do you think?

merge

Page 38: Stash - We Code Together

use Pu" Requests

I know @Ben has already written an algorithm for that

involve

Page 39: Stash - We Code Together

Dem Time

Page 40: Stash - We Code Together
Page 41: Stash - We Code Together

on Codeis great !

Share and Collaborate

Page 42: Stash - We Code Together

on Codeshould be easy and fast

Share and Collaborate

Page 43: Stash - We Code Together

Simple Workflow

Pull Request

Branch

Merge

Page 44: Stash - We Code Together

Simple Workflow

Pull Request

Branch

Merge

No Roles

Page 45: Stash - We Code Together

C

DE

T GETHER

Protecting your code

Page 46: Stash - We Code Together

Pull Request

Branch

Merge

No RolesSimple Workflow

Page 47: Stash - We Code Together

Pull Request

Branch

Merge

No RolesSimple Workflow

Page 48: Stash - We Code Together

Pull Request

Branch

Merge

Some RolesSimple Workflow

Page 49: Stash - We Code Together

Do you want your graduates

merge into the automatic deploy branch?

Page 50: Stash - We Code Together

Branch Permissions

Page 51: Stash - We Code Together

Project Permissions

ProjectWonderland Project

Fairytale

Page 52: Stash - We Code Together

Security DevSpeed

Page 53: Stash - We Code Together

The Repo GuardBeware

Page 54: Stash - We Code Together

Can I get a new Repository?

Please!

Page 55: Stash - We Code Together

Can I get a new Repository?

I'll do in 3 days

Page 56: Stash - We Code Together

Create Repository

Page 57: Stash - We Code Together

C

DE

T GETHER