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 merge-base
Search
Harri Kirik
September 02, 2019
How-to & DIY
1
71
Git merge-base
How git merge-base is awesome and can help you out in difficult situations.
Harri Kirik
September 02, 2019
Tweet
Share
More Decks by Harri Kirik
See All by Harri Kirik
Secure programming techniques: Mobile Development Security guest lecture
harri35
0
81
Support for HSM-like capabilities in Android
harri35
0
130
Why doesn't my in-app QR code work (on location)?
harri35
0
31
Smoke testing your library
harri35
0
26
Collections in Kotlin
harri35
0
34
Data classes in Kotlin
harri35
0
33
How to do delegation in Kotlin
harri35
0
34
Two-factor authentication at GDG Riga
harri35
0
72
Two-factor authentication at GDG Tartu
harri35
0
55
Other Decks in How-to & DIY
See All in How-to & DIY
JAWS-UG/AWSコミュニティプログラムのご紹介 - JAWS-UG 佐賀
awsjcpm
2
170
エンジニアになって2年間で学んだこと
kaiphoenix
0
210
JAWS-UG 福岡 in 北九州 | JAWS-UG/AWSコミュニティ プログラムのご紹介
awsjcpm
1
160
グローバルAWSユーザー コミュニティとJAWS-UG - JAWS FESTA 2024 in Hiroshima
awsjcpm
0
4.9k
How to create better speaker proposals
logico_jp
2
1k
とある航空会社の飛行機の乗り方をお教えします。/20240913-lt
kwada
3
320
新婚19年目から学ぶ夫婦円満の正しい歩き方 / Life is beautiful
soudai
PRO
12
4.8k
わたしと仕事とアジャイルコミュニティ / developers summit 2025
matsuoshi
0
1.2k
JAWS-UGから学んだコミュニティの成功要因 (Success Factors)
awsjcpm
5
570
こんなにあるの? 最近のIPAトレンドを ざっくりまとめてみた
watany
4
1k
すぐできる! 運送業でやってみた業務効率化3選
dochin2635
0
120
AWS Summit Japan 2025 個人的参加レポート
midnight480
0
160
Featured
See All Featured
Into the Great Unknown - MozCon
thekraken
40
2.1k
Building a Scalable Design System with Sketch
lauravandoore
463
33k
Imperfection Machines: The Place of Print at Facebook
scottboms
269
13k
GitHub's CSS Performance
jonrohan
1032
470k
Mobile First: as difficult as doing things right
swwweet
224
10k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
addyosmani
7
900
Done Done
chrislema
185
16k
A better future with KSS
kneath
239
18k
No one is an island. Learnings from fostering a developers community.
thoeni
21
3.5k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
31
2.5k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
30
2.7k
For a Future-Friendly Web
brad_frost
180
9.9k
Transcript
DEMODAY git merge-base dive deeper Location, DD/MM/YYYY Name Surname, job
title Title of the talk Git merge-base September 2nd, 2019 YOU SHOULD UNDERSTAND AND USE
DEMODAY git merge-base git merge-base finds the best common ancestor
between two commits to use in a three-way merge. 02
DEMODAY git merge-base Ancestor is a parent or a parent
of a parent (grandparent) or a great-grandparent, or a great-great-grandparent and so forth 03
DEMODAY git merge-base One common ancestor X is better than
another common ancestor Y if Y is an ancestor of X. 04
DEMODAY git merge-base A common ancestor that does not have
any better common ancestor is a best common ancestor, i.e. a merge base. 05
DEMODAY git merge base Example HERE YOU GO, HAVE AN
06
DEMODAY git merge-base “git merge-base A B” is 1: 07
o---o---o---B / ---2---1---o---o---o---A
DEMODAY git merge-base More than two commits as an argument?
A B C ? 08
DEMODAY git merge-base Then the first commit (A) is the
first argument, other commits (B C) will be merged* to create a second argument. 09
DEMODAY git merge-base “git merge-base A B C” is 1:
010 o----o----o----o----C / o----o----o----B / / ---2----1----o----o----o----A
DEMODAY git merge-base 02 Is awesome! GIT MERGE-BASE
DEMODAY git merge-base 02 Is useful! GIT MERGE-BASE
DEMODAY git merge-base For developing a fix to a release
and dev branches at the same time. 013
DEMODAY git merge base Something has gone wrong with the
release We need to fix it fast! IMAGINE THAT 014
DEMODAY git merge-base 1. ASAP: Fix the release 2. Merge
the fix to dev so development can continue 015
DEMODAY git merge-base 016 o---release-x / ---o---o---o---o---o---dev
DEMODAY git merge-base 1. Create a fix branch at a
merge base > git checkout -b fix-x $(git merge-base develop release-x) 017
DEMODAY git merge-base 018 o---release-x / ---o---o---o---o---o---dev | fix-x
DEMODAY git merge-base 2. Fix the in fix-x branch 3.
At release-x merge in the fix > git merge fix-x 4. Create and release another binary 5. At dev merge in the fix > git merge fix-x 019
DEMODAY git merge-base One fix! 020
DEMODAY git merge-base Merged into two diverged branches! 021
DEMODAY git merge-base Did not get any merge conflicts! 022
DEMODAY git merge-base Everything would still be fine even if
these branches would be merged between themselves. 023
DEMODAY git merge-base Because this is the same commit on
both branches. 024
DEMODAY git merge-base PS: Avoid cherry-picking like the plague! It
makes magic happen. When you least expect it .. 025
DEMODAY git merge-base 02 Is awesome! GIT MERGE-BASE
DEMODAY git merge base Something? OK, COOL.. DID I FORGET
027
DEMODAY git merge-base 028 git merge-base finds best common ancestor(s)
between two commits to use in a three-way merge.
DEMODAY git merge base Bonus content SOME 029
DEMODAY git merge-base 030 How does Git know to merge
changes?
DEMODAY git merge-base 031 .. amount = 15; .. ..
amount = 3; .. File A File B
DEMODAY git merge-base 032 .. amount = 15; .. ..
amount = 3; .. File A File B .. amount = 3; .. Common ancestor
DEMODAY git merge-base Questions, comments, Git stories .. THANKS! September
2nd, 2019