code collaboration with git stash
Download
Skip this Video
Download Presentation
Code Collaboration With Git & Stash (and Bamboo)

Loading in 2 Seconds...

play fullscreen
1 / 78

Code Collaboration With Git & Stash (and Bamboo) - PowerPoint PPT Presentation


  • 974 Views
  • Uploaded on

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

loader
I am the owner, or an agent authorized to act on behalf of the owner, of the copyrighted work described.
capcha
Download Presentation

PowerPoint Slideshow about 'Code Collaboration With Git & Stash (and Bamboo)' - svenpet


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.While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server.


- - - - - - - - - - - - - - - - - - - - - - - - - - E N D - - - - - - - - - - - - - - - - - - - - - - - - - -
Presentation Transcript
code collaboration with git stash
Code Collaboration

with

Git + Stash

+ Bambo

sven peters happy ambassador
Sven Peters

Happy Ambassador

@svenpet

http://svenpet.com

the trouble starts with the team
The trouble starts

with the team

it s not your code
It's not your code

It's your teams code

get hel p
get help

C

D

E

T GETHER

slide7
C

T

GETHER

D

E

Bringing code together

Sharing code with others

Protecting your code

Your coding workflow!

slide8
C

T

GETHER

D

E

Bringing code together

branching
Branching

is cool!

are you crazy
Are

you

crazy?

merge hell
MERGE

HELL

branching1
Branching

is cool!

dvcs rock s
DVCS rocks

Git

Mercurial

a branch
A branch

for every issue

branches
Branches

have short lives

~ 2 days

what about
What about

Continuous Integration ?

builds
Builds

set up for the main branch

this is not
This is not

Continuous Integration

auto merge branches
Auto merge branches

Option #1

change

master

feature branch

push changes

auto merge branches1
Auto merge branches

Option #2

change

feature branch

master

push changes

slide24
C

T

GETHER

D

E

Sharing code with others

do you have such a team member
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 member1
Do you have such a team member?

I want to protect

my job!

feel better
feel better

learn

better

quality

blame

Why do you want to discuss

your code changes?

use pu l reque sts
use Pul Requests

Discuss your code changes

before

they get merged!

use pu l reque sts create
use Pul Requests

create

what do

you think?

use pu l reque sts invite
use Pul Requests

invite

what do

you think?

use pu l reque sts1
use Pul Requests

discuss & approve

what do

you think?

use pu l reque sts merge
use Pul Requests

merge

what do

you think?

use pu l reque sts involve
use Pul Requests

involve

I know @Ben has

already written an

algorithm for that

slide35
Dem

Time

share and collaborate
Share and Collaborate

on Code

is great !

share and collaborate1
Share and Collaborate

on Code

should be easy and fast

simple workflow
Simple Workflow

Merge

Pull

Request

Branch

simple workflow no roles
Simple Workflow

No Roles

Merge

Pull

Request

Branch

slide41
C

T

GETHER

D

E

Protecting your code

slide42
C

T

GETHER

D

E

Make sure....

simple workflow1
Simple Workflow

No Roles

Merge

Pull

Request

Branch

simple workflow2
Simple Workflow

No Roles

Merge

Pull

Request

Branch

simple workflow3
Simple Workflow

Some Roles

Merge

Pull

Request

Branch

slide47
#1

Making sure

that theright peoplecan merge code

into theright branches

review rules
ReviewRules

minimum two aprovals

Merge

Pull

Request

review rules1
ReviewRules

Merge

Pull

Request

slide50
#2

Making sure

that thesomebodyreviewed the code

build rules
Build Rules

Merge

Pull

Request

build rules1
Build Rules

Merge

Pull

Request

slide53
#3

Making sure

that thebuildstays green after a merge

project permissions
ProjectPermissions

Project

Wonderland

Project

Fairytale

slide55
#4

Making sure

that theright peoplehave access

to the code they need

security
Security

DevSpeed

slide61
#5

Making sure

that the development team can move fast

teams are di ff erent
Teamsare different

so are theirworkflows

slide65
Fork

Workflow

slide66
Fork

What is a

?

Makes a copy of a repository on the server

No direct pushing to the original remote repository

Synch changes from the originalremote repository

automatic synch can be activated in Stash

slide67
Fork

Why a

in the enterprise?

tweaking libraries

innovation spikes

protecting components

instead of branch permisions

reduce noise

interaction with contractors

some people need more
Some people

need more

slide69
1.

Features

slide70
2

Features

feature 1
Feature 1:

Stash Add-ons

write a hook
Write a hook!

Protect unmerged branch hook

you must merge before you delete a branch

write a hook1
Write a hook!

Unaprove Reviewer hook

new code in a pul request must be reviewed!

write a hook2
Write a hook!

Branch from green build hook

never branch from a red build

o r download one
or download one

Add-Ons

Hooks

see code
see code

see issue details

see build status

code on
Code On!

svenpet.com/slides

@svenpet

http://svenpet.com

ad