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
Git
Search
sjonnet
May 15, 2019
Technology
0
50
Git
sjonnet
May 15, 2019
Tweet
Share
More Decks by sjonnet
See All by sjonnet
Testing
sjonnet
1
69
Services
sjonnet
1
67
Pollyfills
sjonnet
1
66
MVC
sjonnet
4
190
extCSS
sjonnet
1
63
Error
sjonnet
1
56
Other Decks in Technology
See All in Technology
IaCジェネレーターとBedrockで詳細設計書を生成してみた
tsukasa_ishimaru
4
810
ルーターでプレゼンする
puhitaku
1
3k
競技としてのKaggle、役に立つKaggle
yu4u
6
2.2k
ServiceNow Knowledge Learning Rise up
manarobot
0
220
EMとして2023年度に頑張ったこと / What we did well in FY2023 as a EM
pauli
1
190
家族アルバム みてねにおけるGrafana活用術 / Grafana Meetup Japan Vol.1 LT
isaoshimizu
1
880
コードや知識を組み込む / Incorporate Code and knowledge
ks91
PRO
0
120
エンジニア候補者向け資料2024.04.24.pdf
macloud
0
3.3k
BPStudyの200回を中心にIT業界を振り返る。そしてこれから
haru860
3
360
エンジニアのキャリアをちょっと楽しくする3本の軸/Three Pillars to Make an Engineer's Career More Enjoyable
kwappa
1
2.8k
開発パフォーマンスを最大化するための開発体制
ham0215
2
490
GrafanaMeetup_AmazonManagedGrafanaのアクセス制御機能とマルチテナント環境下でのアクセス制御について
daitak
0
350
Featured
See All Featured
XXLCSS - How to scale CSS and keep your sanity
sugarenia
242
1.2M
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
5
1.3k
What's in a price? How to price your products and services
michaelherold
238
11k
Why You Should Never Use an ORM
jnunemaker
PRO
51
8.6k
Facilitating Awesome Meetings
lara
43
5.6k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
smashingmag
245
20k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
126
32k
Raft: Consensus for Rubyists
vanstee
133
6.3k
The Pragmatic Product Professional
lauravandoore
26
5.8k
Writing Fast Ruby
sferik
622
60k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
17
1.6k
The Art of Programming - Codeland 2020
erikaheidi
43
12k
Transcript
Git Fork, Branch, Rebase, Squash and Flow oh my Shawn
Jonnet <
[email protected]
>
Overview • Fork and Branch • Rebase • Squash •
Flow
Fork and Branch • Forking is useful for creating a
repository to maintain branches that you don't want or are not yet ready to share. • Branching for feature and bug fixing helps keep work isolated from more stable branches and allows the developer to commit often and push often.
git checkout -b feature/<feature>
Rebase • Rebase was designed to specifically help with the
sequence of code commits and progress. Have you looked at your commit history?
git rebase master
Squash • Squash? Wait what this is intended to create
clean commit's so it makes code reviews easier.
git reset HEAD~[1-9*] && git add . && git commit
-m 'Clean commit'
Flow • Release • Hotfix • Feature
git flow feature (start|finish) 0.0.1
git flow release (start|finish) 0.0.1
git flow hotfix (start|finish) 0.0.1