git mismerge

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
rm -rf test test2
mkdir test
cd test
git init
cat >file <<EOF
A
B
C
D
E
EOF
git add file
git commit -a -m "a"
cd ..
git clone test test2
cd test
rm file
cat >file <<EOF
#
#
#
A
B
C
D
E
EOF
git commit -a -m "b1"
rm file
cat >file <<EOF
A
B
C
D
E
#
#
#
A
B
C
D
E
EOF
git commit -a -m "b2"
cd ../test2
rm file; cat >file <<EOF
A
B
changed C
D
E
EOF
git commit -a -m "c1"
cd ../test
git pull ../test2
cat file
# Note that the wrong C was changed by the merge.

git mismerge (annotation)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
rm -rf test test2
mkdir test
cd test
git init
cat >file <<EOF
A
B
C
D
E
EOF
git add file
git commit -a -m "a"
cd ..
git clone test test2
cd test
rm file; cat >file <<EOF
A
B
changed C
D
E
EOF
git commit -a -m "c1"
cd ../test2
rm file
cat >file <<EOF
#
#
#
A
B
C
D
E
EOF
git commit -a -m "b1"
cd ../test
git pull ../test2
cd ../test2
rm file
cat >file <<EOF
A
B
C
D
E
#
#
#
A
B
C
D
E
EOF
git commit -a -m "b2"
cd ../test
git pull ../test2
cat file
echo ^^ pulling one patch at a time
read
rm -rf test test2
mkdir test
cd test
git init
cat >file <<EOF
A
B
C
D
E
EOF
git add file
git commit -a -m "a"
cd ..
git clone test test2
cd test
rm file; cat >file <<EOF
A
B
changed C
D
E
EOF
git commit -a -m "c1"
cd ../test2
rm file
cat >file <<EOF
#
#
#
A
B
C
D
E
EOF
git commit -a -m "b1"
rm file
cat >file <<EOF
A
B
C
D
E
#
#
#
A
B
C
D
E
EOF
git commit -a -m "b2"
cd ../test
git pull ../test2
cat file
echo ^^ pulling both patches together