From: Ian Jackson Date: Sat, 28 Jul 2018 09:38:16 +0000 (+0100) Subject: move pseudomerge box X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=cfcd929327e8c6658549f9629d4b2fd6f34ea3eb;p=talk-2018-dc18-gdr.git move pseudomerge box --- diff --git a/dm.fig b/dm.fig index f3f420d..d90c2a8 100644 --- a/dm.fig +++ b/dm.fig @@ -26,14 +26,16 @@ Single 4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575 4 0 0 44 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001 -6 -6 3150 -3465 9990 -1665 -2 2 0 2 0 7 11 -1 20 0.000 0 0 7 0 0 5 - 3195 -3420 9945 -3420 9945 -1710 3195 -1710 3195 -3420 -4 0 0 10 -1 2 20 0.0000 4 300 5505 3375 -2670 A multi-parent commit made by taking\001 -4 0 0 10 -1 3 20 0.0000 4 300 1860 3375 -3060 Pseudomerge\001 -4 0 0 10 -1 2 20 0.0000 4 300 6360 3375 -2340 just the contents of exactly one of its parents.\001 -4 0 0 10 -1 2 20 0.0000 4 300 1020 3375 -1890 e.g., by\001 -4 0 0 10 -1 14 20 0.0000 4 270 3315 4725 -1890 git merge -s ours\001 +6 -960 -6810 5910 -4980 +2 2 0 2 0 7 10 -1 -1 0.000 0 0 7 0 0 5 + -900 -6750 5850 -6750 5850 -5040 -900 -5040 -900 -6750 +2 2 0 2 7 7 11 -1 20 0.000 0 0 7 0 0 5 + -945 -6795 5895 -6795 5895 -4995 -945 -4995 -945 -6795 +4 0 0 10 -1 2 20 0.0000 4 300 5505 -720 -6000 A multi-parent commit made by taking\001 +4 0 0 10 -1 3 20 0.0000 4 300 1860 -720 -6390 Pseudomerge\001 +4 0 0 10 -1 2 20 0.0000 4 300 6360 -720 -5670 just the contents of exactly one of its parents.\001 +4 0 0 10 -1 2 20 0.0000 4 300 1020 -720 -5220 e.g., by\001 +4 0 0 10 -1 14 20 0.0000 4 270 3315 630 -5220 git merge -s ours\001 -6 1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500 @@ -107,7 +109,7 @@ Single 6960 -7087 2 1 0 2 0 7 11 -1 20 0.000 0 0 -1 1 0 2 3 1 1.00 60.00 120.00 - 7155 -3420 7020 -7020 + 5850 -6750 6570 -7020 2 2 0 2 32 7 10 -1 -1 0.000 0 0 7 0 0 5 -675 -7020 1080 -7020 1080 -7200 -675 -7200 -675 -7020 2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5