Testing a 2-way merge

[fiedl]

Preparation:

[2021-03-14 13:39:43] fiedl@fiedl-mbp ~/code/git-2-way-merge-test
▶ git init

[2021-03-14 13:39:45] fiedl@fiedl-mbp ~/code/git-2-way-merge-test master
▶ git co --orphan foo
▶ cat test
B
C

[2021-03-14 13:42:26] fiedl@fiedl-mbp ~/code/git-2-way-merge-test foo ⚡
▶ git commit

[2021-03-14 13:42:46] fiedl@fiedl-mbp ~/code/git-2-way-merge-test foo
▶ git co --orphan bar
▶ cat test
A
B
C
D

Merge foo into bar

[2021-03-14 13:44:53] fiedl@fiedl-mbp ~/code/git-2-way-merge-test bar
▶ git merge --allow-unrelated-histories foo

Merge bar into foo

[2021-03-14 13:53:11] fiedl@fiedl-mbp ~/code/git-2-way-merge-test foo
▶ git merge --allow-unrelated-histories bar

Result

Both merges create a merge conflict between BC and ABCD.

<<<<<<<
B
C
|||||||
=======
A
B
C
D
>>>>>>>