How Spendsetter gits - Speaker Deck

Slide 1

Slide 1 text

how gits january 22, 2015

Slide 2

Slide 2 text

No content

Slide 3

Slide 3 text

git flow

Slide 4

Slide 4 text

git flow github flow

Slide 5

Slide 5 text

git flow github flow spendsetter flow

Slide 6

Slide 6 text

git flow github flow spendsetter flow (no, we’re not calling it that)

Slide 7

Slide 7 text

main principles

Slide 8

Slide 8 text

two main branches

Slide 9

Slide 9 text

master two main branches

Slide 10

Slide 10 text

master develop two main branches

Slide 11

Slide 11 text

master = what’s on prod

Slide 12

Slide 12 text

master = what’s on prod develop = what’s on stage

Slide 13

Slide 13 text

work from develop

Slide 14

Slide 14 text

hotfixes from master

Slide 15

Slide 15 text

everything is reviewed

Slide 16

Slide 16 text

all work is tied to a JIRA ticket

Slide 17

Slide 17 text

work process

Slide 18

Slide 18 text

update base branch step 1

Slide 19

Slide 19 text

step 1

Slide 20

Slide 20 text

git fetch step 1

Slide 21

Slide 21 text

git fetch step 1 git merge /branch

Slide 22

Slide 22 text

git pull step 1

Slide 23

Slide 23 text

git pull step 1 git pull

Slide 24

Slide 24 text

create new branch step 2

Slide 25

Slide 25 text

step 2

Slide 26

Slide 26 text

git checkout -b step 2

Slide 27

Slide 27 text

names step 2

Slide 28

Slide 28 text

names step 2 feature: delete-campaign

Slide 29

Slide 29 text

names step 2 feature: delete-campaign bug: fix-delete-campaign

Slide 30

Slide 30 text

names step 2 feature: delete-campaign bug: fix-delete-campaign jira ticket: amp-123

Slide 31

Slide 31 text

do work step 3

Slide 32

Slide 32 text

step 3

Slide 33

Slide 33 text

your local env = your business step 3

Slide 34

Slide 34 text

(maybe consider rebasing?) step 3

Slide 35

Slide 35 text

open a pull request step 4

Slide 36

Slide 36 text

open it at any time step 4

Slide 37

Slide 37 text

indicate status in title step 4

Slide 38

Slide 38 text

example: [WIP] step 4

Slide 39

Slide 39 text

ready for review step 5

Slide 40

Slide 40 text

clear, succinct title step 5

Slide 41

Slide 41 text

a long-enough description step 5

Slide 42

Slide 42 text

reviewer needs context step 5

Slide 43

Slide 43 text

review process

Slide 44

Slide 44 text

the feedback loop step 6

Slide 45

Slide 45 text

the feedback loop step 6

Slide 46

Slide 46 text

the feedback loop step 6 receive feedback

Slide 47

Slide 47 text

the feedback loop step 6 receive feedback make change or explain

Slide 48

Slide 48 text

the feedback loop step 6 receive feedback make change or explain repeat

Slide 49

Slide 49 text

ready for merge step 7

Slide 50

Slide 50 text

how to clean up step 7

Slide 51

Slide 51 text

how to clean up step 7 update base branch

Slide 52

Slide 52 text

how to clean up step 7 update base branch git rebase -i

Slide 53

Slide 53 text

how to clean up step 7 update base branch git rebase -i git push --force origin

Slide 54

Slide 54 text

quick note on commit messages step 7

Slide 55

Slide 55 text

step 7

Slide 56

Slide 56 text

first line = summary step 7

Slide 57

Slide 57 text

first line = summary step 7 72 characters, max

Slide 58

Slide 58 text

first line = summary step 7 72 characters, max present tense

Slide 59

Slide 59 text

first line = summary step 7 72 characters, max present tense doesn’t end in a period

Slide 60

Slide 60 text

step 7

Slide 61

Slide 61 text

one blank line step 7

Slide 62

Slide 62 text

one blank line step 7 prose description

Slide 63

Slide 63 text

one blank line step 7 prose description use github-flavored markdown

Slide 64

Slide 64 text

one blank line step 7 prose description use github-flavored markdown mention relevant JIRA tickets

Slide 65

Slide 65 text

step 7

Slide 66

Slide 66 text

Fixes deleting campaigns The resource collection was incorrect on the `DELETE` URL for campaigns. It was `campaign` and should have been `campaigns`. Fixes AMP-123. step 7