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
550
Intro to Docopt
epochblue
1
150
exercism.io
epochblue
0
80
Python Decorators: An Intro
epochblue
2
520
Better Living Through Events
epochblue
0
140
Other Decks in Programming
See All in Programming
AI Coding Meetup #3 - 導入セッション / ai-coding-meetup-3
izumin5210
0
580
Reduxモダナイズ 〜コードのモダン化を通して、将来のライブラリ移行に備える〜
pvcresin
2
680
Web フロントエンドエンジニアに開かれる AI Agent プロダクト開発 - Vercel AI SDK を観察して AI Agent と仲良くなろう! #FEC余熱NIGHT
izumin5210
3
390
Let's Write a Train Tracking Algorithm
twocentstudios
0
220
実践AIチャットボットUI実装入門
syumai
7
2.5k
Pull-Requestの内容を1クリックで動作確認可能にするワークフロー
natmark
2
450
ネイティブ製ガントチャートUIを作って学ぶUICollectionViewLayoutの威力
jrsaruo
0
130
CSC305 Lecture 03
javiergs
PRO
0
230
NetworkXとGNNで学ぶグラフデータ分析入門〜複雑な関係性を解き明かすPythonの力〜
mhrtech
3
1k
フロントエンド開発に役立つクライアントプログラム共通のノウハウ / Universal client-side programming best practices for frontend development
nrslib
7
3.9k
猫と暮らすネットワークカメラ生活🐈 ~Vision frameworkでペットを愛でよう~ / iOSDC Japan 2025
yutailang0119
0
220
クラシルを支える技術と組織
rakutek
0
190
Featured
See All Featured
Raft: Consensus for Rubyists
vanstee
139
7.1k
Building Flexible Design Systems
yeseniaperezcruz
329
39k
Put a Button on it: Removing Barriers to Going Fast.
kastner
60
4k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
29
2.6k
Rebuilding a faster, lazier Slack
samanthasiow
84
9.2k
The World Runs on Bad Software
bkeepers
PRO
71
11k
[RailsConf 2023] Rails as a piece of cake
palkan
57
5.9k
Why You Should Never Use an ORM
jnunemaker
PRO
59
9.6k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
132
19k
For a Future-Friendly Web
brad_frost
180
9.9k
What's in a price? How to price your products and services
michaelherold
246
12k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
31
9.7k
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?