Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
How Spendsetter gits
Search
Bill Israel
January 22, 2015
Programming
1
81
How Spendsetter gits
Behold, Spendsetter's new, improved, and more-refined git process.
Bill Israel
January 22, 2015
Tweet
Share
More Decks by Bill Israel
See All by Bill Israel
Python Decorators: How Do You Even
epochblue
1
510
Intro to Docopt
epochblue
1
140
exercism.io
epochblue
0
73
Python Decorators: An Intro
epochblue
2
520
Better Living Through Events
epochblue
0
130
Other Decks in Programming
See All in Programming
生成AI時代のフルスタック開発
kenn
8
990
AWS Summit Hong Kong 2025: Reinventing Programming - How AI Transforms Our Enterprise Coding Approach
dwchiang
0
150
Носок на сок
bo0om
0
1.4k
監視 やばい
syossan27
12
10k
2025年のz-index設計を考える
tak_dcxi
13
4.9k
AIコーディングの理想と現実
tomohisa
38
40k
OpenTelemetryで始めるベンダーフリーなobservability / Vendor-free observability starting with OpenTelemetry
seike460
PRO
0
120
Live Coding: Migrating an Application to Signals
manfredsteyer
PRO
0
110
KANNA Android の技術的課題と取り組み
watabee
1
580
M5UnitUnified 最新動向 2025/05
gob
0
140
ぽちぽち選択するだけでOSSを読めるVSCode拡張機能
ymbigo
14
6.5k
Road to Ruby for A Linguistics Nerd
hayat01sh1da
PRO
0
370
Featured
See All Featured
jQuery: Nuts, Bolts and Bling
dougneiner
63
7.7k
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
13
850
KATA
mclloyd
29
14k
Embracing the Ebb and Flow
colly
85
4.7k
Designing for humans not robots
tammielis
253
25k
The Success of Rails: Ensuring Growth for the Next 100 Years
eileencodes
45
7.2k
Building a Modern Day E-commerce SEO Strategy
aleyda
40
7.3k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
231
53k
Bootstrapping a Software Product
garrettdimon
PRO
307
110k
Speed Design
sergeychernyshev
29
940
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
45
9.5k
Writing Fast Ruby
sferik
628
61k
Transcript
how gits january 22, 2015
None
git flow
git flow github flow
git flow github flow spendsetter flow
git flow github flow spendsetter flow (no, we’re not calling
it that)
main principles
two main branches
master two main branches
master develop two main branches
master = what’s on prod
master = what’s on prod develop = what’s on stage
work from develop
hotfixes from master
everything is reviewed
all work is tied to a JIRA ticket
work process
update base branch step 1
step 1
git fetch <remote> step 1
git fetch <remote> step 1 git merge <remote>/branch
git pull step 1
git pull step 1 git pull <remote> <branch>
create new branch step 2
step 2
git checkout -b <branch> <base> step 2
<branch> names step 2
<branch> names step 2 feature: delete-campaign
<branch> names step 2 feature: delete-campaign bug: fix-delete-campaign
<branch> names step 2 feature: delete-campaign bug: fix-delete-campaign jira ticket:
amp-123
do work step 3
step 3
your local env = your business step 3
(maybe consider rebasing?) step 3
open a pull request step 4
open it at any time step 4
indicate status in title step 4
example: [WIP] step 4
ready for review step 5
clear, succinct title step 5
a long-enough description step 5
reviewer needs context step 5
review process
the feedback loop step 6
the feedback loop step 6
the feedback loop step 6 receive feedback
the feedback loop step 6 receive feedback make change or
explain
the feedback loop step 6 receive feedback make change or
explain repeat
ready for merge step 7
how to clean up step 7
how to clean up step 7 update base branch
how to clean up step 7 update base branch git
rebase -i <base>
how to clean up step 7 update base branch git
rebase -i <base> git push --force origin <branch>
quick note on commit messages step 7
step 7
first line = summary step 7
first line = summary step 7 72 characters, max
first line = summary step 7 72 characters, max present
tense
first line = summary step 7 72 characters, max present
tense doesn’t end in a period
step 7
one blank line step 7
one blank line step 7 prose description
one blank line step 7 prose description use github-flavored markdown
one blank line step 7 prose description use github-flavored markdown
mention relevant JIRA tickets
step 7
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
merge your pull request step 8
goto 1 step 9
how gits questions?