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
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
|
.. include:: <s5defs.txt>
.. |bullet| unicode:: U+02022
.. footer::
Michael Haggerty |bullet| ``mhagger@alum.mit.edu`` |bullet| GitMerge conference 2013
==========
git-imerge
==========
.. class:: center
``https://github.com/mhagger/git-imerge``
**Incremental merging for Git**
| "git-merge on steroids"
| or
| "git-rebase for the masses"
| Michael Haggerty
| ``mhagger@alum.mit.edu``
| ``http://softwareswirl.blogspot.com/``
Overview
========
* Why you need it
* What it does
* How to use it
Why incremental merge?
======================
.. class:: incremental
.. container::
There are two standard alternatives for combining branches:
* ``git merge``
* ``git rebase``
Both have serious problems.
``git merge`` pain
==================
.. class:: incremental
You need to resolve **one big conflict** that mixes up a lot of little
changes on both sides of the merge.
(Resolving big conflicts is **hard**!)
``git merge`` pain (cont'd)
===========================
.. class:: incremental
Merging is **all-or-nothing**. There is **no way to save** a
partly-done merge, so
* You can't record your progress.
* You can't switch to another branch temporarily.
* If you make a mistake, you can't go back.
If you cannot resolve the **whole** conflict, there is nothing to
do but start over.
``git merge`` pain (cont'd)
===========================
.. class:: incremental
* There is **no way to test** a partly-done merge.
.. class:: incremental
(The code won't even build until the conflict is completely resolved.)
* It is **difficult to collaborate** on a merge with a colleague.
``git rebase`` pain
===================
.. class:: incremental
* You have to reconcile each of the branch commits with *all* of the
changes on master.
* Rebasing is **all-or-nothing**; it is awkward to interrupt a rebase
while it is in progress.
* Rebasing is **unfriendly to collaboration**; it is problematic to
rebase work that has been published.
``git rebase`` pain (cont'd)
============================
.. class:: incremental
* Rebasing **discards history** (namely the old version of the
branch).
* Rebasing often requires similar conflicts to be **resolved multiple
times**.
Incremental merge
=================
``git-imerge`` implements a new merging method, **incremental merge**,
that reduces the pain of merging to its essential minimum.
``git-imerge``
==============
.. class:: incremental
``git-imerge`` presents conflicts pairwise, **one commit from each
branch**
* Small conflicts are *much* easier to resolve than large
conflicts.
* You can view commit messages and individual diffs to see what
each commit was trying to do.
``git-imerge`` (cont'd)
=======================
.. class:: incremental
``git-imerge`` **records all intermediate merges**
...with their correct ancestry,
...as commits in your repository.
Because of this, an incremental merge...
* ...can be **interrupted**.
* ...can be **pushed to a server**.
* ...can be **pulled by a colleague**, worked on, and pushed again.
``git-imerge`` (cont'd)
=======================
.. class:: incremental
``git-imerge`` **never shows the same conflict twice**.
* Once a conflict has been resolved, it is stored in the DAG to
make future merges easier.
``git-imerge`` lets you **test every intermediate state**.
* If there is a problem, you can use ``git bisect`` to find the exact
pairwise merge that was faulty.
* You can redo that merge and continue the incremental merge from
there (retaining earlier pairwise merges).
``git-imerge`` (cont'd)
=======================
.. class:: incremental
``git-imerge`` is **largely automated** and **surprisingly efficient**.
``git-imerge`` allows the final merge to be **simplified for the
permanent record**, omitting the intermediate results.
The basic idea
==============
Suppose you want to merge "branch" into "master"::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
\
A - B - C - D - E - F - G ← branch
.. class:: incremental
First draw the diagram a bit differently...
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
|
A
|
B
|
C
|
D
|
E
|
F
|
G
↑
branch
.. class:: incremental
Now start filling it in, merging one pair at a time...
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
|
B
|
C
|
D
|
E
|
F
|
G
↑
branch
.. class:: incremental
"A1" is a merge commit between commit "1" on master and commit "A"
on branch. It has two parents, like any merge commit.
``git-imerge`` stores commit A1 to your repository.
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
| |
B - B1
|
C
|
D
|
E
|
F
|
G
↑
branch
.. class:: incremental
B1 is a merge between A1 and B.
B1 only has to add the changes from commit B to state A1...
...or equivalently, the changes from 1 into state B.
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
| |
B - B1
|
C
|
D
|
E
|
F
|
G
↑
branch
.. class:: incremental
Most of these pairwise merges will not conflict, and ``git-imerge``
will do them for you automatically
...until it finds a conflict...
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
| |
B - B1
| |
C - C1
|
D
|
E
|
F
|
G
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
| |
B - B1
| |
C - C1
| |
D - D1
|
E
|
F
|
G
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
| |
B - B1
| |
C - C1
| |
D - D1
| |
E - E1
|
F
|
G
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
| |
B - B1
| |
C - C1
| |
D - D1
| |
E - E1
| |
F - F1
|
G
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A - A1
| |
B - B1
| |
C - C1
| |
D - D1
| |
E - E1
| |
F - F1
| |
G - G1
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| |
B - B1
| |
C - C1
| |
D - D1
| |
E - E1
| |
F - F1
| |
G - G1
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| |
C - C1
| |
D - D1
| |
E - E1
| |
F - F1
| |
G - G1
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| |
D - D1
| |
E - E1
| |
F - F1
| |
G - G1
↑
branch
.. class:: incremental
Falling asleep?
(No wonder; ``git-imerge`` is doing all the work.)
It's time for a little quiz.
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| |
D - D1
| |
E - E1
| |
F - F1
| |
G - G1
↑
branch
.. class:: incremental
What is the meaning of C2?
It adds the changes from commit C to state B2...
...equivalently, it adds the changes from commit 2 to state C1.
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| |
D - D1
| |
E - E1
| |
F - F1
| |
G - G1
↑
branch
**Important take-home message**:
.. class:: incremental
* Each of these merges adds the changes from *one single* commit to
a state that has already been committed.
* Git knows a nearby common ancestor.
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| | |
D - D1 - D2
| |
E - E1
| |
F - F1
| |
G - G1
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| | |
D - D1 - D2
| | |
E - E1 - E2
| |
F - F1
| |
G - G1
↑
branch
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| | |
D - D1 - D2
| | |
E - E1 - E2
| |
F - F1 X
| |
G - G1
↑
branch
OOPS! Conflict at X.
.. class:: incremental
``git-imerge`` needs your help!
Please merge E2 and F1 to make a commit F2
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| | |
D - D1 - D2
| | |
E - E1 - E2
| |
F - F1 X
| |
G - G1
↑
branch
.. class:: incremental
The commits share E1 as a common ancestor ("merge base").
You need to add the change made in commit F to state E2...
...or equivalently, add the change made in commit 2 to state
F1.
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | |
A - A1 - A2
| | |
B - B1 - B2
| | |
C - C1 - C2
| | |
D - D1 - D2
| | |
E - E1 - E2
| | |
F - F1 - F2
| |
G - G1
↑
branch
.. class:: incremental
Continue in this manner until the diagram is complete...
The basic idea (cont'd)
=======================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - A10 - A11
| | | | | | | | | | | |
B - B1 - B2 - B3 - B4 - B5 - B6 - B7 - B8 - B9 - B10 - B11
| | | | | | | | | | | |
C - C1 - C2 - C3 - C4 - C5 - C6 - C7 - C8 - C9 - C10 - C11
| | | | | | | | | | | |
D - D1 - D2 - D3 - D4 - D5 - D6 - D7 - D8 - D9 - D10 - D11
| | | | | | | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6 - E7 - E8 - E9 - E10 - E11
| | | | | | | | | | | |
F - F1 - F2 - F3 - F4 - F5 - F6 - F7 - F8 - F9 - F10 - F11
| | | | | | | | | | | |
G - G1 - G2 - G3 - G4 - G5 - G6 - G7 - G8 - G9 - G10 - G11
↑
branch
.. class:: incremental
Done!
A completed incremental merge contains all of the information you
could possibly want to know about combining two branches.
Simplifying the results
=======================
.. class:: incremental
...in fact, it knows *too much* information.
You probably want to eliminate some of the intermediate information
before storing it in your project's permanent record.
For example...
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - A10 - A11
| | | | | | | | | | | |
B - B1 - B2 - B3 - B4 - B5 - B6 - B7 - B8 - B9 - B10 - B11
| | | | | | | | | | | |
C - C1 - C2 - C3 - C4 - C5 - C6 - C7 - C8 - C9 - C10 - C11
| | | | | | | | | | | |
D - D1 - D2 - D3 - D4 - D5 - D6 - D7 - D8 - D9 - D10 - D11
| | | | | | | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6 - E7 - E8 - E9 - E10 - E11
| | | | | | | | | | | |
F - F1 - F2 - F3 - F4 - F5 - F6 - F7 - F8 - F9 - F10 - F11
| | | | | | | | | | | |
G - G1 - G2 - G3 - G4 - G5 - G6 - G7 - G8 - G9 - G10 - G11
↑
branch
.. class:: incremental
Q: Where is the simple merge of "branch" and "master"?
A: G11
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11
| |
A |
| |
B |
| |
C |
| |
D |
| |
E |
| |
F |
| |
G ---------------------------------------------------- G11' ← master
↑
branch
Q: Where is the simple merge of "branch" and "master"?
A: G11
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11
| |
A |
| |
B |
| |
C |
| |
D |
| |
E |
| |
F |
| |
G ---------------------------------------------------- G11' ← master
↑
branch
Usually such a diagram is drawn like so::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - G11' ← master
\ /
A ---- B ---- C ----- D ----- E ----- F ----- G ← branch
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - A10 - A11
| | | | | | | | | | | |
B - B1 - B2 - B3 - B4 - B5 - B6 - B7 - B8 - B9 - B10 - B11
| | | | | | | | | | | |
C - C1 - C2 - C3 - C4 - C5 - C6 - C7 - C8 - C9 - C10 - C11
| | | | | | | | | | | |
D - D1 - D2 - D3 - D4 - D5 - D6 - D7 - D8 - D9 - D10 - D11
| | | | | | | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6 - E7 - E8 - E9 - E10 - E11
| | | | | | | | | | | |
F - F1 - F2 - F3 - F4 - F5 - F6 - F7 - F8 - F9 - F10 - F11
| | | | | | | | | | | |
G - G1 - G2 - G3 - G4 - G5 - G6 - G7 - G8 - G9 - G10 - G11
↑
branch
.. class:: incremental
Q: Where is the rebase of "branch" onto "master"?
A: The rightmost column...
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
|
A11'
|
B11'
|
C11'
|
D11'
|
E11'
|
F11'
|
G11' ← branch
Q: Where is the rebase of "branch" onto "master"?
A: The rightmost column.
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - A10 - A11
| | | | | | | | | | | |
B - B1 - B2 - B3 - B4 - B5 - B6 - B7 - B8 - B9 - B10 - B11
| | | | | | | | | | | |
C - C1 - C2 - C3 - C4 - C5 - C6 - C7 - C8 - C9 - C10 - C11
| | | | | | | | | | | |
D - D1 - D2 - D3 - D4 - D5 - D6 - D7 - D8 - D9 - D10 - D11
| | | | | | | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6 - E7 - E8 - E9 - E10 - E11
| | | | | | | | | | | |
F - F1 - F2 - F3 - F4 - F5 - F6 - F7 - F8 - F9 - F10 - F11
| | | | | | | | | | | |
G - G1 - G2 - G3 - G4 - G5 - G6 - G7 - G8 - G9 - G10 - G11
↑
branch
.. class:: incremental
Q: Where is the rebase of "master" onto "branch"?
A: The bottommost row...
Simplifying the results (cont'd)
================================
::
o - 0
|
A
|
B
|
C
|
D
|
E
|
F
|
G - G1'- G2'- G3'- G4'- G5'- G6'- G7'- G8'- G9'- G10'- G11' ← master
↑
branch
Q: Where is the rebase of "master" onto "branch"?
A: The bottommost row.
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - A10 - A11
| | | | | | | | | | | |
B - B1 - B2 - B3 - B4 - B5 - B6 - B7 - B8 - B9 - B10 - B11
| | | | | | | | | | | |
C - C1 - C2 - C3 - C4 - C5 - C6 - C7 - C8 - C9 - C10 - C11
| | | | | | | | | | | |
D - D1 - D2 - D3 - D4 - D5 - D6 - D7 - D8 - D9 - D10 - D11
| | | | | | | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6 - E7 - E8 - E9 - E10 - E11
| | | | | | | | | | | |
F - F1 - F2 - F3 - F4 - F5 - F6 - F7 - F8 - F9 - F10 - F11
| | | | | | | | | | | |
G - G1 - G2 - G3 - G4 - G5 - G6 - G7 - G8 - G9 - G10 - G11
↑
branch
.. class:: incremental
If you have already published branch, consider simplifying into a
"rebase with history"...
Simplifying the results (cont'd)
================================
::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| |
A ---------------------------------------------------- A11'
| |
B ---------------------------------------------------- B11'
| |
C ---------------------------------------------------- C11'
| |
D ---------------------------------------------------- D11'
| |
E ---------------------------------------------------- E11'
| |
F ---------------------------------------------------- F11'
| |
G ---------------------------------------------------- G11'
↑
branch
.. class:: incremental
Rebase-with-history is a useful hybrid between rebasing and
merging:
* It retains both the old and the new versions of branch.
* It can be used even if branch has been published.
Efficiency
==========
.. class:: incremental
In most cases ``git-imerge`` does not have to construct the full
incremental merge.
It uses an efficient algorithm, based on bisection, for filling in
large blocks of the incremental merge quickly and homing in on the
conflicts.
Efficiency (cont'd)
===================
A typical in-progress merge might look like this::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - A1 - A2 - A3 - A4 - A5 - A6 - A7 - A8 - A9 - A10 - A11
| | | | | | | | |
B - B1 - B2 - B3 - B4 - B5 - B6 - B7 - B8 X
| | | | | | |
C - C1 - C2 - C3 - C4 - C5 - C6 X
| | | | | | |
D - D1 - D2 - D3 - D4 - D5 - D6
| | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6
| |
F - F1 X
| |
G - G1
↑
branch
.. class:: incremental
* The Xs marks pairwise merges that conflict
Efficiency (cont'd)
===================
But ``git-imerge`` only needs to compute this::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - -- -- -- -- -- A6 - -- A8 - A9 - A10 - A11
| | | | | | | | |
B - -- -- -- -- -- B6 - B7 - B8 X
| | | | | | |
C - -- -- -- -- -- C6 X
| | | | | | |
D - -- -- -- -- -- D6
| | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6
| |
F - F1 X
| |
G - G1
↑
branch
.. class:: incremental
(Plus a few test merges to locate the conflicts.)
Efficiency (cont'd)
===================
But ``git-imerge`` only needs to compute this::
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
| | | | | | | | | | | |
A - -- -- -- -- -- A6 - -- A8 - A9 - A10 - A11
| | | | | | | | |
B - -- -- -- -- -- B6 - B7 - B8 X
| | | | | | |
C - -- -- -- -- -- C6 X
| | | | | | |
D - -- -- -- -- -- D6
| | | | | | |
E - E1 - E2 - E3 - E4 - E5 - E6
| |
F - F1 X
| |
G - G1
↑
branch
.. class:: incremental
The gaps could be skipped because the merges on the boundaries were
all successful.
git-imerge demo
===============
Time for a simple demo.
git-imerge demo
===============
Time for a simple demo.
You start like ``git merge``::
$ git checkout master
$ git imerge start --name=merge-branch --first-parent branch
.. class:: incremental
Each imerge gets a name.
git-imerge demo (cont'd)
========================
``git-imerge`` uses bisection to find pairwise merges that conflict,
filling everything it can::
Attempting automerge of 1-1...success.
Attempting automerge of 1-4...success.
Attempting automerge of 1-6...success.
Attempting automerge of 9-6...failure.
Attempting automerge of 5-6...failure.
Attempting automerge of 3-6...success.
Attempting automerge of 4-6...failure.
Attempting automerge of 4-1...success.
Attempting automerge of 4-4...failure.
Attempting automerge of 4-3...failure.
Attempting automerge of 4-2...success.
Attempting automerge of 9-2...success.
Autofilling 1-6...success.
Autofilling 2-6...success.
Autofilling 3-1...success.
Autofilling 3-2...success.
[...]
Autofilling 3-6...success.
Autofilling 4-2...success.
[...]
Autofilling 8-2...success.
Autofilling 9-1...success.
Autofilling 9-2...success.
git-imerge demo (cont'd)
========================
When it hits a conflict, it asks for help::
Attempting automerge of 4-3...failure.
Switched to branch 'imerge/merge-branch'
Auto-merging conflict.txt
CONFLICT (add/add): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.
Original first commit:
commit b7fe8a65d0cee2e388e971c4b29be8c6cbb25ee1
Author: Lou User <luser@example.com>
Date: Fri May 3 14:03:05 2013 +0200
c conflict
Original second commit:
commit bd0373cadae08d872536bcda8214c0631e19945a
Author: Lou User <luser@example.com>
Date: Fri May 3 14:03:05 2013 +0200
d conflict
There was a conflict merging commit 4-3, shown above.
Please resolve the conflict, commit the result, then type
git-imerge continue
git-imerge demo (cont'd)
========================
You can get a diagram of the current state of the merge (it is in
crude ASCII-art for now)::
$ git imerge diagram
**********
*??|?????|
*--+-----+
*??|#?????
*??|??????
*??|??????
*--+??????
Key:
|,-,+ = rectangles forming current merge frontier
* = merge done manually
. = merge done automatically
# = conflict that is currently blocking progress
@ = merge was blocked but has been resolved
? = no merge recorded
git-imerge demo (cont'd)
========================
You fix the conflict then tell ``git-imerge`` to continue::
$ git add ...
$ git commit
$ git imerge continue
Merge has been recorded for merge 4-3.
Attempting automerge of 5-3...success.
Attempting automerge of 5-3...success.
Attempting automerge of 9-3...success.
Autofilling 5-3...success.
Autofilling 6-3...success.
Autofilling 7-3...success.
Autofilling 8-3...success.
Autofilling 9-3...success.
Attempting automerge of 4-4...success.
Attempting automerge of 4-5...success.
Attempting automerge of 4-6...success.
Attempting automerge of 9-6...success.
Autofilling 4-6...success.
Autofilling 5-6...success.
Autofilling 6-6...success.
Autofilling 7-6...success.
Autofilling 8-6...success.
Autofilling 9-4...success.
Autofilling 9-5...success.
Autofilling 9-6...success.
Merge is complete!
git-imerge demo (cont'd)
========================
Here is a diagram of the completed merge::
$ git imerge diagram
**********
*??.?????|
*??......|
*??.*....|
*??.?????|
*??.?????|
*--------+
Key:
|,-,+ = rectangles forming current merge frontier
* = merge done manually
. = merge done automatically
# = conflict that is currently blocking progress
@ = merge was blocked but has been resolved
? = no merge recorded
git-imerge demo (cont'd)
========================
Now simplify the incremental merge into a simple merge, a simple
rebase, or a rebase-with-history::
$ git imerge finish --goal=merge
$ git log -1 --decorate
commit 79afd870a52e216114596b52c800e45139badf74 (HEAD, merge-branch)
Merge: 8453321 993a8a9
Author: Lou User <luser@example.com>
Date: Wed May 8 10:08:07 2013 +0200
Merge frobnicator into floobifier.
Intermediate data
=================
During an incremental merge, intermediate results are stored directly
in your repository as special references under ``refs/imerge/NAME/``:
``refs/imerge/NAME/state``
A blob containing a little bit of metadata.
``refs/imerge/NAME/{manual,auto}/M-N``
Manual/automatic merge that includes all of the changes through
commits ``M`` on master and ``N`` on branch.
``refs/heads/imerge/NAME``
Temporary branch used when resolving merge conflicts.
``refs/heads/NAME``
Default branch where final results are stored.
Summary
=======
As of this writing, ``git-imerge`` is very new and still experimental.
Please try it out, but use it cautiously (e.g., on a clone of your
main Git repository).
.. class:: incremental
| Give me your feedback!
| Michael Haggerty
| ``mhagger@alum.mit.edu``
| Get involved!
| ``https://github.com/mhagger/git-imerge``
| For more details, see my blog "SoftwareSwirl":
| ``http://softwareswirl.blogspot.com/``
Thank you for your attention!
|
