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
Claude Agent SDK を使ってみよう
hyshu
0
1.4k
モテるデスク環境
mozumasu
3
1.3k
EMこそClaude Codeでコード調査しよう
shibayu36
0
420
Catch Up: Go Style Guide Update
andpad
0
250
登壇は dynamic! な営みである / speech is dynamic
da1chi
0
360
なんでRustの環境構築してないのにRust製のツールが動くの? / Why Do Rust-Based Tools Run Without a Rust Environment?
ssssota
14
46k
Devvox Belgium - Agentic AI Patterns
kdubois
1
150
The Past, Present, and Future of Enterprise Java
ivargrimstad
0
250
Vueのバリデーション、結局どれを選べばいい? ― 自作バリデーションの限界と、脱却までの道のり ― / Which Vue Validation Library Should We Really Use? The Limits of Self-Made Validation and How I Finally Moved On
neginasu
2
1.6k
CSC509 Lecture 06
javiergs
PRO
0
270
CSC305 Lecture 10
javiergs
PRO
0
250
ALL CODE BASE ARE BELONG TO STUDY
uzulla
28
6.7k
Featured
See All Featured
Gamification - CAS2011
davidbonilla
81
5.5k
Embracing the Ebb and Flow
colly
88
4.9k
Fantastic passwords and where to find them - at NoRuKo
philnash
52
3.5k
Done Done
chrislema
185
16k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
140
34k
Scaling GitHub
holman
463
140k
A better future with KSS
kneath
239
18k
Six Lessons from altMBA
skipperchong
29
4k
Principles of Awesome APIs and How to Build Them.
keavy
127
17k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
52
5.7k
Learning to Love Humans: Emotional Interface Design
aarron
274
41k
YesSQL, Process and Tooling at Scale
rocio
173
15k
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?