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 Workflows: Beware of merge conflicts, they ...
Search
Olawale
July 07, 2023
Programming
0
110
Git Workflows: Beware of merge conflicts, they bite you!
Olawale
July 07, 2023
Tweet
Share
Other Decks in Programming
See All in Programming
いりゃあせ、PHPカンファレンス名古屋2025 / Welcome to PHP Conference Nagoya 2025
ttskch
1
270
さいきょうのレイヤードアーキテクチャについて考えてみた
yahiru
3
730
一休.com のログイン体験を支える技術 〜Web Components x Vue.js 活用事例と最適化について〜
atsumim
0
110
『GO』アプリ バックエンドサーバのコスト削減
mot_techtalk
0
130
Rails アプリ地図考 Flush Cut
makicamel
1
110
SpringBoot3.4の構造化ログ #kanjava
irof
2
970
WebDriver BiDiとは何なのか
yotahada3
1
140
Formの複雑さに立ち向かう
bmthd
1
720
負債になりにくいCSSをデザイナとつくるには?
fsubal
9
2.3k
自分ひとりから始められる生産性向上の取り組み #でぃーぷらすオオサカ
irof
8
2.6k
JavaScriptツール群「UnJS」を5分で一気に駆け巡る!
k1tikurisu
10
1.8k
最近のVS Codeで気になるニュース 2025/01
74th
1
250
Featured
See All Featured
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
193
16k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
232
17k
The Illustrated Children's Guide to Kubernetes
chrisshort
48
49k
Intergalactic Javascript Robots from Outer Space
tanoku
270
27k
Mobile First: as difficult as doing things right
swwweet
223
9.3k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
31
2.1k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
47
5.2k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
27
1.5k
The Language of Interfaces
destraynor
156
24k
GitHub's CSS Performance
jonrohan
1030
460k
How GitHub (no longer) Works
holman
313
140k
Learning to Love Humans: Emotional Interface Design
aarron
273
40k
Transcript
None
Outline • Why do we need them? • What are
they? • How do I use them? • Useful git commands
Why • Inefficient Release Process • Code conflicts • Scalability
concerns
Git Workflow Git Workflow is a git branching model for
teams that scales.
Git Workflow - Types • Git Flow • Github flow
• Trunk-based flow • Space Git Flow
Git Flow - Main Branches main develop For production code
only! Development code
Git Flow - Supporting Branches main develop Feature branches $
git checkout -b myfeature develop
Git Flow - Supporting Branches main develop feature branches $
git checkout -b release-1.0 develop release branches release branch for 1.0 release branch 1.1
main develop feature branches release branches release branch for 1.0
release branch 1.1 hotfixes
Useful git commands Git merge vs Git Rebase Both are
used for incorporating changes from one branch to another!
Git merge vs Git Rebase git merge feature develop develop
Git merge Result develop New Commit
Git Rebase Result develop git checkout feature git rebase develop
• No new merge commit • It results in a linear git history
Git Rebase - Interactive mode git checkout feature git rebase
-i develop pick 33d5b7a Add paypal payment method #1 pick 9480b3d Fix something #2 pick 5c67e61 Add idea payment method #3 develop
Git Rebase - Interactive mode SQUASHING! pick 33d5b7a Add paypal
payment method #1 fixup 9480b3d Fix something #2 pick 5c67e61 Add idea payment method #3 develop
Git Rebase The golden rule of git rebase is to
never use it on public branches
Questions?