Testing a 3-way merge

[fiedl]

Preparation

[2021-03-14 14:08:12] fiedl@fiedl-mbp ~/code/git-3-way-merge-test
▶ git init

[2021-03-14 14:09:28] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main
▶ cat test
A
B
C

[2021-03-14 14:09:23] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main ⚡
▶ git commit -m "commit ABC on main"  # 4b69425

[2021-03-14 14:10:26] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main ⚡
▶ cat test
A
B
C
D

[2021-03-14 14:10:38] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main ⚡
▶ git commit -m "commit ABCD on main"

[2021-03-14 14:10:58] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main
▶ git co 4b69425
▶ git co -b foo
▶ cat test
B
C

[2021-03-14 14:12:02] fiedl@fiedl-mbp ~/code/git-3-way-merge-test foo ⚡
▶ git commit -m "commit BC on foo"

Merge foo into main with base 4b69425

[2021-03-14 14:12:45] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main
▶ git merge-base main foo
4b694250ad510bb37a7676334258df85c1e8f8a0

[2021-03-14 14:12:54] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main
▶ git merge foo
automatischer Merge von test
Merge made by the 'recursive' strategy.

[2021-03-14 14:13:09] fiedl@fiedl-mbp ~/code/git-3-way-merge-test main
▶ cat test
B
C
D

Works as expected. ✅