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
59
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
71
Support for HSM-like capabilities in Android
harri35
0
92
Why doesn't my in-app QR code work (on location)?
harri35
0
21
Smoke testing your library
harri35
0
22
Collections in Kotlin
harri35
0
27
Data classes in Kotlin
harri35
0
20
How to do delegation in Kotlin
harri35
0
27
Two-factor authentication at GDG Riga
harri35
0
61
Two-factor authentication at GDG Tartu
harri35
0
49
Other Decks in How-to & DIY
See All in How-to & DIY
enebularを活用したNode-REDによるIoTシステム開発と運用
taokiuhuru
0
280
メタバース研究所のマネジメントプレイヤーが爆速で業務効率化している件 #VRStudioLab
vrstudiolab
1
1.2k
「赤い芸人」養成講座
mobilebiz
0
950
にじさんじ格闘ゲーム制作プロジェクト
vfgpproject
0
7.1k
20230520_ScrumFestNiigata_iwamu
takusamar
0
340
担当アイドルを応援する傘を作ろう! (として失敗した話)
subroh0508
0
350
AWS User Community [JAWS-UG大分支部]
awsjcpm
2
110
一番やさしいDJ入門 2024
stefafafan
6
1.4k
スクフェス福岡前夜祭 LT
pokotyamu
0
110
100回分は振り返りできなかったけど振り返り #iotlt vol101
n0bisuke2
0
210
#技術を動画で伝える技術 〜 α シリーズを活用した技術紹介・プレゼン動画制作ノウハウ〜
1heisuzuki
3
510
[너구리랑! 회고 밋업 2023] GTD & PARA -머릿속이 복잡하던 일상에 적용한 정리법 // 토르 님
develop_neoguri
1
100
Featured
See All Featured
Product Roadmaps are Hard
iamctodd
43
9.7k
Rebuilding a faster, lazier Slack
samanthasiow
72
8.2k
Music & Morning Musume
bryan
41
5.6k
The Cult of Friendly URLs
andyhume
74
5.7k
Writing Fast Ruby
sferik
620
60k
Large-scale JavaScript Application Architecture
addyosmani
503
110k
How GitHub Uses GitHub to Build GitHub
holman
468
290k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
1
1.3k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
226
16k
Robots, Beer and Maslow
schacon
PRO
155
7.9k
Code Reviewing Like a Champion
maltzj
513
39k
We Have a Design System, Now What?
morganepeng
42
6.7k
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