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
時計仕掛けのCompose
mkeeda
1
280
第3回関東Kaggler会_AtCoderはKaggleの役に立つ
chettub
3
890
ペアーズでの、Langfuseを中心とした評価ドリブンなリリースサイクルのご紹介
fukubaka0825
2
300
ISUCON14公式反省会LT: 社内ISUCONの話
astj
PRO
0
180
定理証明プラットフォーム lapisla.net
abap34
1
1.7k
ファインディの テックブログ爆誕までの軌跡
starfish719
2
1.1k
Honoのおもしろいミドルウェアをみてみよう
yusukebe
1
200
XStateを用いた堅牢なReact Components設計~複雑なClient Stateをシンプルに~ @React Tokyo ミートアップ #2
kfurusho
1
770
密集、ドキュメントのコロケーション with AWS Lambda
satoshi256kbyte
0
170
Unity Android XR入門
sakutama_11
0
140
[Fin-JAWS 第38回 ~re:Invent 2024 金融re:Cap~]FaultInjectionServiceアップデート@pre:Invent2024
shintaro_fukatsu
0
400
chibiccをCILに移植した結果 (NGK2025S版)
kekyo
PRO
0
210
Featured
See All Featured
Designing for humans not robots
tammielis
250
25k
Large-scale JavaScript Application Architecture
addyosmani
510
110k
Building Flexible Design Systems
yeseniaperezcruz
328
38k
Designing on Purpose - Digital PM Summit 2013
jponch
117
7.1k
Git: the NoSQL Database
bkeepers
PRO
427
64k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
8
270
Fashionably flexible responsive web design (full day workshop)
malarkey
406
66k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
What's in a price? How to price your products and services
michaelherold
244
12k
Mobile First: as difficult as doing things right
swwweet
223
9.3k
The Language of Interfaces
destraynor
156
24k
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?