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
83
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
530
Intro to Docopt
epochblue
1
150
exercism.io
epochblue
0
77
Python Decorators: An Intro
epochblue
2
520
Better Living Through Events
epochblue
0
140
Other Decks in Programming
See All in Programming
[DevinMeetupTokyo2025] コード書かせないDevinの使い方
takumiyoshikawa
2
260
Quality Gates in the Age of Agentic Coding
helmedeiros
PRO
1
120
JetBrainsのAI機能の紹介 #jjug
yusuke
0
190
GitHub Copilotの全体像と活用のヒント AI駆動開発の最初の一歩
74th
6
1.8k
DataformでPythonする / dataform-de-python
snhryt
0
150
可変性を制する設計: 構造と振る舞いから考える概念モデリングとその実装
a_suenami
10
1.6k
DatadogのArchived LogsをSnowflakeで高速に検索する方法(Archive Searchでオワコンにならないことを祈って) / How to search Datadog Archived Logs quickly with Snowflake (hoping Datadog Archive Search doesn’t make this obsolete)
civitaspo
0
110
ZeroETLで始めるDynamoDBとS3の連携
afooooil
0
150
DynamoDBは怖くない!〜テーブル設計の勘所とテスト戦略〜
hyamazaki
0
180
Constant integer division faster than compiler-generated code
herumi
1
160
ゲームの物理
fadis
1
160
React は次の10年を生き残れるか:3つのトレンドから考える
oukayuka
41
16k
Featured
See All Featured
Building Adaptive Systems
keathley
43
2.7k
Docker and Python
trallard
45
3.5k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
53
2.9k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
15
1.6k
Raft: Consensus for Rubyists
vanstee
140
7k
Unsuck your backbone
ammeep
671
58k
Gamification - CAS2011
davidbonilla
81
5.4k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
234
17k
Optimising Largest Contentful Paint
csswizardry
37
3.4k
The Language of Interfaces
destraynor
158
25k
Building Flexible Design Systems
yeseniaperezcruz
328
39k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
49
2.9k
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?