Commit 3c6fc46b authored by Thibaud Duhautbout's avatar Thibaud Duhautbout

Concept de branche, divergence + illustrations

parent 688cff2f
Pipeline #28678 passed with stage
in 16 seconds
%!PS-Adobe-3.0 EPSF-3.0
%%Creator: cairo 1.15.12 (http://cairographics.org)
%%CreationDate: Sun Oct 14 15:25:07 2018
%%Pages: 1
%%DocumentData: Clean7Bit
%%LanguageLevel: 2
%%BoundingBox: 55 577 547 769
%%EndComments
%%BeginProlog
50 dict begin
/q { gsave } bind def
/Q { grestore } bind def
/cm { 6 array astore concat } bind def
/w { setlinewidth } bind def
/J { setlinecap } bind def
/j { setlinejoin } bind def
/M { setmiterlimit } bind def
/d { setdash } bind def
/m { moveto } bind def
/l { lineto } bind def
/c { curveto } bind def
/h { closepath } bind def
/re { exch dup neg 3 1 roll 5 3 roll moveto 0 rlineto
0 exch rlineto 0 rlineto closepath } bind def
/S { stroke } bind def
/f { fill } bind def
/f* { eofill } bind def
/n { newpath } bind def
/W { clip } bind def
/W* { eoclip } bind def
/BT { } bind def
/ET { } bind def
/BDC { mark 3 1 roll /BDC pdfmark } bind def
/EMC { mark /EMC pdfmark } bind def
/cairo_store_point { /cairo_point_y exch def /cairo_point_x exch def } def
/Tj { show currentpoint cairo_store_point } bind def
/TJ {
{
dup
type /stringtype eq
{ show } { -0.001 mul 0 cairo_font_matrix dtransform rmoveto } ifelse
} forall
currentpoint cairo_store_point
} bind def
/cairo_selectfont { cairo_font_matrix aload pop pop pop 0 0 6 array astore
cairo_font exch selectfont cairo_point_x cairo_point_y moveto } bind def
/Tf { pop /cairo_font exch def /cairo_font_matrix where
{ pop cairo_selectfont } if } bind def
/Td { matrix translate cairo_font_matrix matrix concatmatrix dup
/cairo_font_matrix exch def dup 4 get exch 5 get cairo_store_point
/cairo_font where { pop cairo_selectfont } if } bind def
/Tm { 2 copy 8 2 roll 6 array astore /cairo_font_matrix exch def
cairo_store_point /cairo_font where { pop cairo_selectfont } if } bind def
/g { setgray } bind def
/rg { setrgbcolor } bind def
/d1 { setcachedevice } bind def
/cairo_data_source {
CairoDataIndex CairoData length lt
{ CairoData CairoDataIndex get /CairoDataIndex CairoDataIndex 1 add def }
{ () } ifelse
} def
/cairo_flush_ascii85_file { cairo_ascii85_file status { cairo_ascii85_file flushfile } if } def
/cairo_image { image cairo_flush_ascii85_file } def
/cairo_imagemask { imagemask cairo_flush_ascii85_file } def
%%EndProlog
%%BeginSetup
%%BeginResource: font DejaVuSans
11 dict begin
/FontType 42 def
/FontName /DejaVuSans def
/PaintType 0 def
/FontMatrix [ 1 0 0 1 0 0 ] def
/FontBBox [ 0 0 0 0 ] def
/Encoding 256 array def
0 1 255 { Encoding exch /.notdef put } for
Encoding 48 /zero put
Encoding 49 /one put
Encoding 50 /two put
Encoding 51 /three put
Encoding 52 /four put
Encoding 53 /five put
Encoding 54 /six put
Encoding 55 /seven put
Encoding 67 /C put
/CharStrings 10 dict dup begin
/.notdef 0 def
/C 1 def
/zero 2 def
/one 3 def
/two 4 def
/three 5 def
/four 6 def
/five 7 def
/six 8 def
/seven 9 def
end readonly def
/sfnts [
<0001000000090080000300106376742000691d3900000734000001fe6670676d7134766a0000
0934000000ab676c7966d86d4c6f0000009c0000069868656164085da0a7000009e000000036
686865610d9f077700000a1800000024686d7478331b05ac00000a3c000000286c6f63610000
212400000a640000002c6d6178700477067100000a9000000020707265703b07f10000000ab0
0000056800020066fe96046605a400030007001a400c04fb0006fb0108057f0204002fc4d4ec
310010d4ecd4ec301311211125211121660400fc73031bfce5fe96070ef8f272062900010073
ffe3052705f000190036401a0da10eae0a951101a100ae04951791118c1a07190d003014101a
10fcec32ec310010e4f4ecf4ec10eef6ee30b40f1b1f1b02015d01152e012320001110002132
3637150e01232000111000213216052766e782ff00fef00110010082e7666aed84feadfe7a01
86015386ed0562d55f5efec7fed8fed9fec75e5fd34848019f01670168019f47000000020087
ffe3048f05f0000b00170023401306a01200a00c91128c18091c0f1e031c151b1810fcecf4ec
310010e4f4ec10ee30012202111012333212111002273200111000232200111000028b9c9d9d
9c9d9d9d9dfb0109fef7fbfbfef701090550fecdfeccfecdfecd0133013301340133a0fe73fe
86fe87fe73018d0179017a018d00000100e10000045a05d5000a004040154203a00402a00581
0700a009081f061c03001f010b10d44bb00f5458b9000100403859ecc4fcec31002fec32f4ec
d4ec304b5358592201b40f030f04025d3721110535253311211521fe014afe990165ca014afc
a4aa047348b848fad5aa0000000100960000044a05f0001c009e4027191a1b03181c11050400
110505044210a111940da014910400a00200100a02010a1c171003061d10fc4bb015544bb016
545b4bb014545b58b90003ffc03859c4d4ecc0c011123931002fec32f4ecf4ec304b53580710
05ed0705ed01b01c1011173959220140325504560556077a047a05761b87190704000419041a
041b051c74007606751a731b741c82008619821a821b821ca800a81b115d005d252115213536
00373e0135342623220607353e01333204151406070600018902c1fc4c73018d33614da7865f
d3787ad458e80114455b19fef4aaaaaa7701913a6d974977964243cc3132e8c25ca5701dfeeb
00000001009cffe3047305f000280070402e0015130a86091f862013a0150da00993061ca020
932391068c15a329161c13000314191c2620101c03141f09062910fc4bb016544bb014545b58
b90009ffc03859c4c4d4ecf4ec11173939310010ece4f4e4ec10e6ee10ee10ee10ee11123930
014009641e611f6120642104005d011e0115140421222627351e013332363534262b01353332
3635342623220607353e01333204151406033f91a3fed0fee85ec76a54c86dbec7b9a5aeb695
9ea39853be7273c959e6010c8e03251fc490ddf22525c33132968f8495a67770737b2426b420
20d1b27cab0000020064000004a405d50002000d0081401d010d030d0003030d4200030b07a0
0501038109010c0a001c0608040c0e10dc4bb00b544bb00d545b58b9000cffc03859d43cc4ec
32113931002fe4d43cec321239304b5358071004c9071005c9592201402a0b002a0048005900
690077008a000716012b0026012b0336014e014f0c4f0d5601660175017a0385010d5d005d09
012103331133152311231121350306fe0201fe35fed5d5c9fd5e0525fce303cdfc33a8fea001
60c300000001009effe3046405d5001d005e4023041a071186101d1aa00714a010890d02a000
810d8c07a41e171c010a031c000a10061e10fc014bb016544bb014545b58b90010ffc038594b
b00f5458b9001000403859c4d4ec10c4ee310010e4e4f4ec10e6ee10fec410ee111239301321
1521113e0133320015140021222627351e0133323635342623220607dd0319fda02c582cfa01
24fed4feef5ec3685ac06badcacaad51a15405d5aafe920f0ffeeeeaf1fef52020cb3130b69c
9cb6242600000002008fffe3049605f0000b0024005840241306000d860c00a01606a01c16a5
10a00c8922911c8c250c22091c191e131c03211f1b2510fcececf4ece4310010e4f4e4fce410
ee10ee10ee111239304014cb00cb01cd02cd03cd04cb05cb0607a41eb21e025d015d01220615
141633323635342601152e01232202033e0133320015140023200011100021321602a4889f9f
88889f9f01094c9b4cc8d30f3bb26be10105fef0e2fefdfeee0150011b4c9b033bbaa2a1bbbb
a1a2ba0279b82426fef2feef575dfeefebe6feea018d0179016201a51e000000000100a80000
046805d5000600634018051102030203110405044205a0008103050301040100060710fcccc4
11393931002ff4ec304b5358071005ed071005ed5922014bb0165458bd000700400001000700
07ffc03811373859401258020106031a05390548056703b000b006075d005d13211501230121
a803c0fde2d301fefd3305d556fa81052b000000013500b800cb00cb00c100aa009c01a600b8
00660000007100cb00a002b20085007500b800c301cb0189022d00cb00a600f000d300aa0087
00cb03aa0400014a003300cb000000d9050200f4015400b4009c01390114013907060400044e
04b4045204b804e704cd0037047304cd04600473013303a2055605a60556053903c5021200c9
001f00b801df007300ba03e9033303bc0444040e00df03cd03aa00e503aa0404000000cb008f
00a4007b00b80014016f007f027b0252008f00c705cd009a009a006f00cb00cd019e01d300f0
00ba018300d5009803040248009e01d500c100cb00f600830354027f00000333026600d300c7
00a400cd008f009a0073040005d5010a00fe022b00a400b4009c00000062009c0000001d032d
05d505d505d505f0007f007b005400a406b80614072301d300b800cb00a601c301ec069300a0
00d3035c037103db0185042304a80448008f0139011401390360008f05d5019a061407230666
0179046004600460047b009c00000277046001aa00e904600762007b00c5007f027b000000b4
025205cd006600bc00660077061000cd013b01850389008f007b0000001d00cd074a042f009c
009c0000077d006f0000006f0335006a006f007b00ae00b2002d0396008f027b00f600830354
063705f6008f009c04e10266008f018d02f600cd03440029006604ee00730000140000960000
b707060504030201002c2010b002254964b040515820c859212d2cb002254964b040515820c8
59212d2c20100720b00050b00d7920b8ffff5058041b0559b0051cb0032508b0042523e120b0
0050b00d7920b8ffff5058041b0559b0051cb0032508e12d2c4b505820b0fd454459212d2cb0
02254560442d2c4b5358b00225b0022545445921212d2c45442d2cb00225b0022549b00525b0
05254960b0206368208a108a233a8a10653a2d000001000000025999578e32845f0f3cf5001f
080000000000d17dfdf400000000d17dfdf4f7d6fc4c0e5909dc000000080000000100000000
00010000076dfe1d00000efef7d6fa510e5900010000000000000000000000000000000a04cd
00660596007305170087051700e1051700960517009c051700640517009e0517008f051700a8
0000000000000044000000dc00000160000001d0000002d0000003b800000474000005340000
060c0000069800010000000a0354002b0068000c000200100099000800000415021600080004
b8028040fffbfe03fa1403f92503f83203f79603f60e03f5fe03f4fe03f32503f20e03f19603
f02503ef8a4105effe03ee9603ed9603ecfa03ebfa03eafe03e93a03e84203e7fe03e63203e5
e45305e59603e48a4105e45303e3e22f05e3fa03e22f03e1fe03e0fe03df3203de1403dd9603
dcfe03db1203da7d03d9bb03d8fe03d68a4105d67d03d5d44705d57d03d44703d3d21b05d3fe
03d21b03d1fe03d0fe03cffe03cefe03cd9603cccb1e05ccfe03cb1e03ca3203c9fe03c68511
05c61c03c51603c4fe03c3fe03c2fe03c1fe03c0fe03bffe03befe03bdfe03bcfe03bbfe03ba
1103b9862505b9fe03b8b7bb05b8fe03b7b65d05b7bb03b78004b6b52505b65d40ff03b64004
b52503b4fe03b39603b2fe03b1fe03b0fe03affe03ae6403ad0e03acab2505ac6403abaa1205
ab2503aa1203a98a4105a9fa03a8fe03a7fe03a6fe03a51203a4fe03a3a20e05a33203a20e03
a16403a08a4105a096039ffe039e9d0c059efe039d0c039c9b19059c64039b9a10059b19039a
1003990a0398fe0397960d0597fe03960d03958a410595960394930e05942803930e0392fa03
9190bb0591fe03908f5d0590bb039080048f8e25058f5d038f40048e25038dfe038c8b2e058c
fe038b2e038a8625058a410389880b05891403880b0387862505876403868511058625038511
0384fe038382110583fe0382110381fe0380fe037ffe0340ff7e7d7d057efe037d7d037c6403
7b5415057b25037afe0379fe03780e03770c03760a0375fe0374fa0373fa0372fa0371fa0370
fe036ffe036efe036c21036bfe036a1142056a530369fe03687d036711420566fe0365fe0364
fe0363fe0362fe03613a0360fa035e0c035dfe035bfe035afe0359580a0559fa03580a035716
190557320356fe035554150555420354150353011005531803521403514a130551fe03500b03
4ffe034e4d10054efe034d10034cfe034b4a13054bfe034a4910054a1303491d0d0549100348
0d0347fe0346960345960344fe0343022d0543fa0342bb03414b0340fe033ffe033e3d12053e
14033d3c0f053d12033c3b0d053c40ff0f033b0d033afe0339fe033837140538fa0337361005
37140336350b05361003350b03341e03330d0332310b0532fe03310b03302f0b05300d032f0b
032e2d09052e10032d09032c32032b2a25052b64032a2912052a250329120328272505284103
27250326250b05260f03250b0324fe0323fe03220f03210110052112032064031ffa031e1d0d
051e64031d0d031c1142051cfe031bfa031a42031911420519fe031864031716190517fe0316
01100516190315fe0314fe0313fe031211420512fe0311022d05114203107d030f64030efe03
0d0c16050dfe030c0110050c16030bfe030a100309fe0308022d0508fe030714030664030401
100504fe03401503022d0503fe0302011005022d0301100300fe0301b80164858d012b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b002b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b1d00>
] def
/f-0-0 currentdict end definefont pop
%%EndResource
%%EndSetup
%%Page: 1 1
%%BeginPageSetup
%%PageBoundingBox: 55 577 547 769
%%EndPageSetup
q 55 577 492 192 rectclip
1 0 0 -1 0 842 cm q
0 g
0.751181 w
0 J
0 j
[] 0.0 d
4 M q 1 0 0 1 0 0 cm
94.926 143.805 m 120.52 143.805 l S Q
102.438 143.805 m 105.441 140.801 l 94.926 143.805 l 105.441 146.809 l
h
102.438 143.805 m f*
0.80126 w
q 1 0 0 1 0 0 cm
102.438 143.805 m 105.441 140.801 l 94.926 143.805 l 105.441 146.809 l
h
102.438 143.805 m S Q
0.75 w
q 1 0 0 1 0 0 cm
159.918 143.805 m 186.242 93.73 l S Q
163.406 137.168 m 162.148 133.113 l 159.918 143.805 l 167.457 135.906 l
h
163.406 137.168 m f*
0.708086 w
q 0.525796 -1 1 0.525796 0 0 cm
-40.15 184.517 m -37.491 181.861 l -46.786 184.518 l -37.493 187.171 l
h
-40.15 184.517 m S Q
0.75 w
q 1 0 0 1 0 0 cm
159.918 143.805 m 251.133 193.879 l S Q
166.492 147.414 m 170.562 146.227 l 159.918 143.805 l 167.676 151.488 l
h
166.492 147.414 m f*
0.701283 w
q 1 0.548952 -0.548952 1 0 0 cm
190.122 43.046 m 192.749 40.417 l 183.548 43.046 l 192.751 45.678 l h
190.122 43.046 m S Q
0.75 w
q 1 0 0 1 0 0 cm
290.527 193.879 m 314.762 243.949 l S Q
293.793 200.629 m 297.801 202.023 l 290.527 193.879 l 292.402 204.637 l
h
293.793 200.629 m f*
0.720092 w
q 0.483996 1 -1 0.483996 0 0 cm
277.758 -159.359 m 280.46 -162.06 l 271.009 -159.36 l 280.46 -156.661 l
h
277.758 -159.359 m S Q
0.75 w
q 1 0 0 1 0 0 cm
290.527 193.879 m 379.09 193.879 l S Q
298.027 193.879 m 301.027 190.879 l 290.527 193.879 l 301.027 196.879 l
h
298.027 193.879 m f*
0.8 w
q 1 0 0 1 0 0 cm
298.027 193.879 m 301.027 190.879 l 290.527 193.879 l 301.027 196.879 l
h
298.027 193.879 m S Q
0.75 w
q 1 0 0 1 0 0 cm
354.156 243.949 m 443.07 243.949 l S Q
361.656 243.949 m 364.656 240.949 l 354.156 243.949 l 364.656 246.949 l
h
361.656 243.949 m f*
0.8 w
q 1 0.0000000318812 -0.0000000318812 1 0 0 cm
361.656 243.949 m 364.656 240.949 l 354.156 243.949 l 364.656 246.949 l
h
361.656 243.949 m S Q
0.75 w
q 1 0 0 1 0 0 cm
415.332 193.879 m 507.051 193.879 l S Q
422.832 193.879 m 425.832 190.879 l 415.332 193.879 l 425.832 196.879 l
h
422.832 193.879 m f*
0.8 w
q 1 0 0 1 0 0 cm
422.832 193.879 m 425.832 190.879 l 415.332 193.879 l 425.832 196.879 l
h
422.832 193.879 m S Q
0.751181 w
q 1 0 0 1 0 0 cm
482.469 243.949 m 507.051 193.879 l S Q
485.777 237.207 m 484.406 233.188 l 482.469 243.949 l 489.797 235.836 l
h
485.777 237.207 m f*
0.719249 w
q 0.490967 -1 1 0.490967 0 0 cm
1.042 485.266 m 3.739 482.571 l -5.699 485.267 l 3.737 487.962 l h
1.042 485.266 m S Q
0.905882 0.764706 0.658824 rg
75.227 163.504 m 64.348 163.504 55.531 154.684 55.531 143.805 c 55.531
132.926 64.348 124.105 75.227 124.105 c 86.105 124.105 94.926 132.926 94.926
143.805 c 94.926 154.684 86.105 163.504 75.227 163.504 c h
75.227 163.504 m f
0 g
0.75 w
q 0 1 -1 0 0 0 cm
163.504 -75.227 m 163.504 -64.348 154.684 -55.531 143.805 -55.531 c 132.926
-55.531 124.105 -64.348 124.105 -75.227 c 124.105 -86.105 132.926 -94.926
143.805 -94.926 c 154.684 -94.926 163.504 -86.105 163.504 -75.227 c h
163.504 -75.227 m S Q
BT
19.999999 0 0 -19.999999 61.976207 151.084951 Tm
/f-0-0 1 Tf
(C0)Tj
ET
0.905882 0.764706 0.658824 rg
140.219 163.504 m 129.34 163.504 120.52 154.684 120.52 143.805 c 120.52
132.926 129.34 124.105 140.219 124.105 c 151.098 124.105 159.918 132.926
159.918 143.805 c 159.918 154.684 151.098 163.504 140.219 163.504 c h
140.219 163.504 m f
0 g
q 0 1 -1 0 0 0 cm
163.504 -140.219 m 163.504 -129.34 154.684 -120.52 143.805 -120.52 c 132.926
-120.52 124.105 -129.34 124.105 -140.219 c 124.105 -151.098 132.926 -159.918
143.805 -159.918 c 154.684 -159.918 163.504 -151.098 163.504 -140.219 c
h
163.504 -140.219 m S Q
BT
19.999999 0 0 -19.999999 126.966172 151.084951 Tm
/f-0-0 1 Tf
(C1)Tj
ET
0.905882 0.239216 0.658824 rg
205.941 113.43 m 195.062 113.43 186.242 104.609 186.242 93.73 c 186.242
82.852 195.062 74.035 205.941 74.035 c 216.82 74.035 225.641 82.852 225.641
93.73 c 225.641 104.609 216.82 113.43 205.941 113.43 c h
205.941 113.43 m f
0 g
q 0 1 -1 0 0 0 cm
113.43 -205.941 m 113.43 -195.062 104.609 -186.242 93.73 -186.242 c 82.852
-186.242 74.035 -195.062 74.035 -205.941 c 74.035 -216.82 82.852 -225.641
93.73 -225.641 c 104.609 -225.641 113.43 -216.82 113.43 -205.941 c h
113.43 -205.941 m S Q
BT
19.999999 0 0 -19.999999 193.027041 101.012348 Tm
/f-0-0 1 Tf
(C2)Tj
ET
0.388235 0.764706 0.658824 rg
270.828 213.574 m 259.949 213.574 251.133 204.758 251.133 193.879 c 251.133
183 259.949 174.18 270.828 174.18 c 281.707 174.18 290.527 183 290.527
193.879 c 290.527 204.758 281.707 213.574 270.828 213.574 c h
270.828 213.574 m f
0 g
q 0 1 -1 0 0 0 cm
213.574 -270.828 m 213.574 -259.949 204.758 -251.133 193.879 -251.133 c
183 -251.133 174.18 -259.949 174.18 -270.828 c 174.18 -281.707 183 -290.527
193.879 -290.527 c 204.758 -290.527 213.574 -281.707 213.574 -270.828 c
h
213.574 -270.828 m S Q
BT
19.999999 0 0 -19.999999 257.713903 201.157618 Tm
/f-0-0 1 Tf
(C3)Tj
ET
0.227451 0.611765 0.847059 rg
334.809 263.648 m 323.93 263.648 315.109 254.828 315.109 243.949 c 315.109
233.07 323.93 224.254 334.809 224.254 c 345.688 224.254 354.508 233.07
354.508 243.949 c 354.508 254.828 345.688 263.648 334.809 263.648 c h
334.809 263.648 m f
0 g
q 0 1 -1 0 0 0 cm
263.648 -334.809 m 263.648 -323.93 254.828 -315.109 243.949 -315.109 c
233.07 -315.109 224.254 -323.93 224.254 -334.809 c 224.254 -345.688 233.07
-354.508 243.949 -354.508 c 254.828 -354.508 263.648 -345.688 263.648 -334.809
c h
263.648 -334.809 m S Q
BT
19.999999 0 0 -19.999999 321.454571 251.230268 Tm
/f-0-0 1 Tf
(C4)Tj
ET
0.388235 0.764706 0.658824 rg
398.789 213.574 m 387.91 213.574 379.09 204.758 379.09 193.879 c 379.09
183 387.91 174.18 398.789 174.18 c 409.668 174.18 418.488 183 418.488 193.879
c 418.488 204.758 409.668 213.574 398.789 213.574 c h
398.789 213.574 m f
0 g
q 0 1 -1 0 0 0 cm
213.574 -398.789 m 213.574 -387.91 204.758 -379.09 193.879 -379.09 c 183
-379.09 174.18 -387.91 174.18 -398.789 c 174.18 -409.668 183 -418.488 193.879
-418.488 c 204.758 -418.488 213.574 -409.668 213.574 -398.789 c h
213.574 -398.789 m S Q
BT
19.999999 0 0 -19.999999 385.746974 201.157618 Tm
/f-0-0 1 Tf
(C5)Tj
ET
0.227451 0.611765 0.847059 rg
462.77 263.648 m 451.891 263.648 443.07 254.828 443.07 243.949 c 443.07
233.07 451.891 224.254 462.77 224.254 c 473.648 224.254 482.469 233.07
482.469 243.949 c 482.469 254.828 473.648 263.648 462.77 263.648 c h
462.77 263.648 m f
0 g
q 0 1 -1 0 0 0 cm
263.648 -462.77 m 263.648 -451.891 254.828 -443.07 243.949 -443.07 c 233.07
-443.07 224.254 -451.891 224.254 -462.77 c 224.254 -473.648 233.07 -482.469
243.949 -482.469 c 254.828 -482.469 263.648 -473.648 263.648 -462.77 c
h
263.648 -462.77 m S Q
BT
19.999999 0 0 -19.999999 449.482692 251.230269 Tm
/f-0-0 1 Tf
(C6)Tj
ET
0.388235 0.764706 0.658824 rg
526.75 213.574 m 515.871 213.574 507.051 204.758 507.051 193.879 c 507.051
183 515.871 174.18 526.75 174.18 c 537.629 174.18 546.445 183 546.445 193.879
c 546.445 204.758 537.629 213.574 526.75 213.574 c h
526.75 213.574 m f
0 g
q 0 1 -1 0 0 0 cm
213.574 -526.75 m 213.574 -515.871 204.758 -507.051 193.879 -507.051 c
183 -507.051 174.18 -515.871 174.18 -526.75 c 174.18 -537.629 183 -546.445
193.879 -546.445 c 204.758 -546.445 213.574 -537.629 213.574 -526.75 c
h
213.574 -526.75 m S Q
BT
19.999999 0 0 -19.999999 513.687269 201.157618 Tm
/f-0-0 1 Tf
(C7)Tj
ET
Q Q
showpage
%%Trailer
end
%%EOF
......@@ -179,6 +179,89 @@ The key's randomart image is:
\subsection{Principe}
\begin{frame}{Principe}
\begin{block}{}
\enquote{Git permet de maintenir plusieurs versions différentes en parallèle}
\begin{flushright}
\textit{Nous, il y a deux semaines}
\end{flushright}
\end{block}
\Pause
Concrètement, tous les commits ne sont pas nécessairement sur la même \textbf{branche} de l'arbre.
\begin{center}
\includegraphics[width=.7\linewidth]{./imgs/branches.eps}
\end{center}
\textit{Le sens des flèches n'est pas chronologique ! Chaque commit pointe vers son père.}
\end{frame}
\begin{frame}{Création d'une divergence -- cas 1}
\begin{center}
\includegraphics[width=.4\linewidth]{./imgs/divergence.png}
\end{center}
\begin{block}{Analyse}
\begin{itemize}
\item C2 et C3 ont tous les deux C1 comme père;
\item C2 et C3 introduisent des modifications différentes après C1;
\item ici, C2 et C3 sont sur \textbf{deux branches différentes de C1};
\end{itemize}
\end{block}
\end{frame}
\begin{frame}{Création d'une divergence -- cas 2}
\begin{center}
\includegraphics[width=.3\linewidth]{./imgs/divergence_2.png}
\end{center}
\begin{block}{Analyse}
\begin{itemize}
\item C4 et C5 ont tous les deux C3 comme père;
\item C4 et C5 introduisent des modifications différentes après C3;
\item C4 est sur une branche \textbf{différente de C3};
\item C5 est sur \textbf{la même branche que C3}.
\end{itemize}
\end{block}
\end{frame}
\begin{frame}{Création d'une divergence}
\begin{block}{}
\centering
\enquote{Mais pourquoi est-ce qu'on fait ça ?}
\end{block}
\Pause
\begin{itemize}
\item pour isoler les travaux en cours
\item pour enregistrer des versions spécifiques
\end{itemize}
\Pause
\begin{block}{}
\centering
\enquote{Et c'est quoi la différence entre le cas 1 et le cas 2 ?}
\end{block}
\Pause
En théorie, pas grand chose à part la couleur :
\begin{itemize}
\item c'est une divergence dans les deux cas;
\item dans le cas 1, il est encore possible de faire un commit sur la branche jaune après C1.
\end{itemize}
En pratique avec git :
\begin{itemize}
\item ça dépend des modifications apportées et du sens que vous donnez à vos branches.
\end{itemize}
\end{frame}
\subsection{Application}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment