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
80
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
Cursorを活用したAIプログラミングについて 入門
rect
0
120
The Nature of Complexity in John Ousterhout’s Philosophy of Software Design
philipschwarz
PRO
0
150
Flutterでllama.cppをつかってローカルLLMを試してみた
sakuraidayo
0
110
REALITY コマンド作成チュートリアル
nishiuriraku
0
110
20250429 - CNTUG Meetup #67 / DevOps Taiwan Meetup #69 - Deep Dive into Tetragon: Building Runtime Security and Observability with eBPF
tico88612
0
150
Lambda(Python)の リファクタリングが好きなんです
komakichi
3
230
エンジニア向けCursor勉強会 @ SmartHR
yukisnow1823
2
10k
Contribute to Comunities | React Tokyo Meetup #4 LT
sasagar
0
580
2ヶ月で生産性2倍、お買い物アプリ「カウシェ」4チーム同時改善の取り組み
ike002jp
1
110
KANNA Android の技術的課題と取り組み
watabee
0
160
Jakarta EE Meets AI
ivargrimstad
0
510
「”誤った使い方をすることが困難”な設計」で良いコードの基礎を固めよう / phpcon-odawara-2025
taniguhey
0
180
Featured
See All Featured
Into the Great Unknown - MozCon
thekraken
38
1.7k
The MySQL Ecosystem @ GitHub 2015
samlambert
251
12k
Building Applications with DynamoDB
mza
94
6.3k
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
45
9.5k
Keith and Marios Guide to Fast Websites
keithpitt
411
22k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
31
1.1k
Scaling GitHub
holman
459
140k
A better future with KSS
kneath
239
17k
Producing Creativity
orderedlist
PRO
344
40k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
160
15k
Optimising Largest Contentful Paint
csswizardry
37
3.2k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
29
1.6k
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?