From 6d303671466b16143bcb3759de2286d3b9cb8046 Mon Sep 17 00:00:00 2001
From: Philippe Dosch <Philippe.Dosch@loria.fr>
Date: Mon, 6 Jan 2014 22:51:46 +0100
Subject: [PATCH] End of merge description
---
aftermerge.obj | 377 ++++++++++++++++++++++++++++++++++++++++++++++++
branchmerge.tex | 18 +++
2 files changed, 395 insertions(+)
create mode 100644 aftermerge.obj
diff --git a/aftermerge.obj b/aftermerge.obj
new file mode 100644
index 0000000..27a35d6
--- /dev/null
+++ b/aftermerge.obj
@@ -0,0 +1,377 @@
+%TGIF 4.2.5-QPL
+state(0,37,100.000,0,0,0,16,1,0,1,1,2,0,1,1,1,0,'Courier',0,138240,0,0,1,10,0,0,1,1,0,16,0,0,1,1,1,1,1500,1500,1,0,2880,0).
+%
+% @(#)$Header$
+% %W%
+%
+unit("1 pixel/pixel").
+color_info(50,65535,0,[
+ "Black", 0, 0, 0, 0, 0, 0, 1,
+ "White", 65535, 65535, 65535, 65535, 65535, 65535, 1,
+ "#000080", 0, 0, 32896, 0, 0, 32768, 1,
+ "#008000", 0, 32896, 0, 0, 32768, 0, 1,
+ "#008080", 0, 32896, 32896, 0, 32768, 32768, 1,
+ "#800000", 32896, 0, 0, 32768, 0, 0, 1,
+ "#800080", 32896, 0, 32896, 32768, 0, 32768, 1,
+ "#ff8000", 65535, 32896, 0, 65280, 32768, 0, 1,
+ "#808080", 32896, 32896, 32896, 32768, 32768, 32768, 1,
+ "#c0c0c0", 49344, 49344, 49344, 49152, 49152, 49152, 1,
+ "#0000ff", 0, 0, 65535, 0, 0, 65280, 1,
+ "#00ff00", 0, 65535, 0, 0, 65280, 0, 1,
+ "#00ffff", 0, 65535, 65535, 0, 65280, 65280, 1,
+ "#ff0000", 65535, 0, 0, 65280, 0, 0, 1,
+ "#ff00ff", 65535, 0, 65535, 65280, 0, 65280, 1,
+ "#ffff00", 65535, 65535, 0, 65280, 65280, 0, 1,
+ "#4c4c4c", 19532, 19532, 19532, 19456, 19456, 19456, 1,
+ "#b3b3b3", 46003, 46003, 46003, 45824, 45824, 45824, 1,
+ "#e6e6e6", 59110, 59110, 59110, 58880, 58880, 58880, 1,
+ "#dc2300", 56540, 8995, 0, 56320, 8960, 0, 1,
+ "#ff3333", 65535, 13107, 13107, 65280, 13056, 13056, 1,
+ "#b84747", 47288, 18247, 18247, 47104, 18176, 18176, 1,
+ "#99284c", 39321, 10280, 19532, 39168, 10240, 19456, 1,
+ "#94476b", 38036, 18247, 27499, 37888, 18176, 27392, 1,
+ "#9966cc", 39321, 26214, 52428, 39168, 26112, 52224, 1,
+ "#6b2394", 27499, 8995, 38036, 27392, 8960, 37888, 1,
+ "#5e11a6", 24158, 4369, 42662, 24064, 4352, 42496, 1,
+ "#4700b8", 18247, 0, 47288, 18176, 0, 47104, 1,
+ "#2323dc", 8995, 8995, 56540, 8960, 8960, 56320, 1,
+ "#0099ff", 0, 39321, 65535, 0, 39168, 65280, 1,
+ "#99ccff", 39321, 52428, 65535, 39168, 52224, 65280, 1,
+ "#00dcff", 0, 56540, 65535, 0, 56320, 65280, 1,
+ "#23b8dc", 8995, 47288, 56540, 8960, 47104, 56320, 1,
+ "#33a3a3", 13107, 41891, 41891, 13056, 41728, 41728, 1,
+ "#355e00", 13621, 24158, 0, 13568, 24064, 0, 1,
+ "#7da647", 32125, 42662, 18247, 32000, 42496, 18176, 1,
+ "#00ae00", 0, 44718, 0, 0, 44544, 0, 1,
+ "#3deb3d", 15677, 60395, 15677, 15616, 60160, 15616, 1,
+ "#ffff99", 65535, 65535, 39321, 65280, 65280, 39168, 1,
+ "#e6e64c", 59110, 59110, 19532, 58880, 58880, 19456, 1,
+ "#b3b300", 46003, 46003, 0, 45824, 45824, 0, 1,
+ "#666600", 26214, 26214, 0, 26112, 26112, 0, 1,
+ "#4c1900", 19532, 6425, 0, 19456, 6400, 0, 1,
+ "#663300", 26214, 13107, 0, 26112, 13056, 0, 1,
+ "#804c19", 32896, 19532, 6425, 32768, 19456, 6400, 1,
+ "#996633", 39321, 26214, 13107, 39168, 26112, 13056, 1,
+ "#cc6633", 52428, 26214, 13107, 52224, 26112, 13056, 1,
+ "#ff6633", 65535, 26214, 13107, 65280, 26112, 13056, 1,
+ "#ff9966", 65535, 39321, 26214, 65280, 39168, 26112, 1,
+ "#ffcc99", 65535, 52428, 39321, 65280, 52224, 39168, 1
+]).
+script_frac("0.6").
+fg_bg_colors('Black','white').
+dont_reencode("FFDingbests:ZapfDingbats").
+objshadow_info('#c0c0c0',2,2).
+rotate_pivot(0,0,0,0).
+spline_tightness(1).
+page(1,"",1,'').
+group([
+polygon('#0099ff','',13,[
+ 650,266,650,304,650,320,666,320,784,320,800,320,800,304,800,266,
+ 800,250,784,250,666,250,650,250,650,266],1,1,1,0,0,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',654,254,796,316,1,1,0,1,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',725,253,1,1,1,144,15,2,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,265,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "7758ee4", 1, 0, 0,
+text('#0099ff',724,270,1,1,1,93,29,3,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,294,'',[
+minilines(93,29,0,0,1,0,0,[
+mini_line(93,24,5,0,0,0,[
+str_block(0,93,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,93,24,5,0,-1,0,0,0,0,0,
+ "7758ee4")])
+])
+])]))
+])
+],
+4,0,0,[
+]).
+group([
+polygon('#0099ff','',13,[
+ 150,336,150,374,150,390,166,390,284,390,300,390,300,374,300,336,
+ 300,320,284,320,166,320,150,320,150,336],1,1,1,0,33,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',154,324,296,386,1,1,0,34,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',225,323,1,1,1,144,15,35,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,335,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "42b8626", 1, 0, 0,
+text('#0099ff',224,340,1,1,1,93,29,36,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,364,'',[
+minilines(93,29,0,0,1,0,0,[
+mini_line(93,24,5,0,0,0,[
+str_block(0,93,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,93,24,5,0,-1,0,0,0,0,0,
+ "42b8626")])
+])
+])]))
+])
+],
+32,0,0,[
+]).
+group([
+polygon('#0099ff','',13,[
+ 400,336,400,374,400,390,416,390,534,390,550,390,550,374,550,336,
+ 550,320,534,320,416,320,400,320,400,336],1,1,1,0,43,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',404,324,546,386,1,1,0,44,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',475,323,1,1,1,144,15,45,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,335,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "09e6e96", 1, 0, 0,
+text('#0099ff',474,340,1,1,1,93,29,46,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,364,'',[
+minilines(93,29,0,0,1,0,0,[
+mini_line(93,24,5,0,0,0,[
+str_block(0,93,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,93,24,5,0,-1,0,0,0,0,0,
+ "09e6e96")])
+])
+])]))
+])
+],
+42,0,0,[
+]).
+poly('Black','',2,[
+ 1400,140,1300,140],1,3,1,55,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+poly('Black','',2,[
+ 400,360,300,360],1,3,1,56,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+group([
+polygon('#ff8000','',13,[
+ 1150,116,1150,154,1150,170,1166,170,1284,170,1300,170,1300,154,1300,116,
+ 1300,100,1284,100,1166,100,1150,100,1150,116],1,1,1,0,75,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#ff8000','',1154,104,1296,166,1,1,0,76,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',1225,103,1,1,1,144,15,77,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,115,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "master", 1, 0, 0,
+text('#0099ff',1224,120,1,1,1,81,29,78,24,5,0,0,0,0,-65534,81,29,0,0,"",0,0,0,0,144,'',[
+minilines(81,29,0,0,1,0,0,[
+mini_line(81,24,5,0,0,0,[
+str_block(0,81,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,81,24,5,0,-1,0,0,0,0,0,
+ "master")])
+])
+])]))
+])
+],
+74,0,0,[
+]).
+poly('Black','',2,[
+ 1230,170,1230,250],1,3,1,89,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+poly('Black','',2,[
+ 150,360,50,360],1,3,1,96,0,1,2,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+group([
+polygon('#ff8000','',13,[
+ 650,556,650,594,650,610,666,610,784,610,800,610,800,594,800,556,
+ 800,540,784,540,666,540,650,540,650,556],1,1,1,0,98,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#ff8000','',654,544,796,606,1,1,0,99,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',725,543,1,1,1,144,15,100,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,555,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "nouveau", 1, 0, 0,
+text('#0099ff',724,560,1,1,1,101,29,101,24,5,0,0,0,0,-65534,101,29,0,0,"",0,0,0,0,584,'',[
+minilines(101,29,0,0,1,0,0,[
+mini_line(101,24,5,0,0,0,[
+str_block(0,101,24,5,0,-2,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,101,24,5,0,-2,0,0,0,0,0,
+ "nouveau")])
+])
+])]))
+])
+],
+97,0,0,[
+]).
+poly('Black','',2,[
+ 730,540,730,460],1,3,1,109,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+group([
+polygon('#7da647','',13,[
+ 1400,116,1400,154,1400,170,1416,170,1534,170,1550,170,1550,154,1550,116,
+ 1550,100,1534,100,1416,100,1400,100,1400,116],1,1,1,0,111,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#7da647','',1404,104,1546,166,1,1,0,112,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',1475,103,1,1,1,144,15,113,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,115,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "HEAD", 1, 0, 0,
+text('#0099ff',1475,120,1,1,1,72,29,114,24,5,0,0,0,0,-65534,72,29,0,0,"",0,0,0,0,144,'',[
+minilines(72,29,0,0,1,0,0,[
+mini_line(72,24,5,0,0,0,[
+str_block(0,72,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,72,24,5,0,-1,0,0,0,0,0,
+ "HEAD")])
+])
+])]))
+])
+],
+110,0,0,[
+]).
+poly('Black','',2,[
+ 900,290,800,290],1,3,1,137,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+group([
+polygon('#0099ff','',13,[
+ 650,406,650,444,650,460,666,460,784,460,800,460,800,444,800,406,
+ 800,390,784,390,666,390,650,390,650,406],1,1,1,0,139,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',654,394,796,456,1,1,0,140,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',725,393,1,1,1,144,15,141,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,405,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "de5e92c", 1, 0, 0,
+text('#0099ff',724,410,1,1,1,95,29,142,24,5,0,0,0,0,-65534,95,29,0,0,"",0,0,0,0,434,'',[
+minilines(95,29,0,0,1,0,0,[
+mini_line(95,24,5,0,0,0,[
+str_block(0,95,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,95,24,5,0,-1,0,0,0,0,0,
+ "de5e92c")])
+])
+])]))
+])
+],
+138,0,0,[
+]).
+group([
+polygon('#0099ff','',13,[
+ 900,266,900,304,900,320,916,320,1034,320,1050,320,1050,304,1050,266,
+ 1050,250,1034,250,916,250,900,250,900,266],1,1,1,0,150,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',904,254,1046,316,1,1,0,151,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',975,253,1,1,1,144,15,152,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,265,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "c64938a", 1, 0, 0,
+text('#0099ff',975,270,1,1,1,92,29,153,24,5,0,0,0,0,-65534,92,29,0,0,"",0,0,0,0,294,'',[
+minilines(92,29,0,0,1,0,0,[
+mini_line(92,24,5,0,0,0,[
+str_block(0,92,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,92,24,5,0,-1,0,0,0,0,0,
+ "c64938a")])
+])
+])]))
+])
+],
+149,0,0,[
+]).
+poly('Black','',2,[
+ 650,290,550,350],1,3,1,155,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+poly('Black','',2,[
+ 650,420,550,360],1,3,1,156,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+group([
+polygon('#0099ff','',13,[
+ 1150,266,1150,304,1150,320,1166,320,1284,320,1300,320,1300,304,1300,266,
+ 1300,250,1284,250,1166,250,1150,250,1150,266],1,1,1,0,158,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',1154,254,1296,316,1,1,0,159,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',1225,253,1,1,1,144,15,160,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,265,'',[
+minilines(144,15,0,0,1,0,0,[
+mini_line(144,12,3,0,0,0,[
+str_block(0,144,12,3,0,-1,0,0,0,[
+str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+ "auto_center_attr")])
+])
+])])),
+attr("label=", "d67a598", 1, 0, 0,
+text('#0099ff',1225,270,1,1,1,94,29,161,24,5,0,0,0,0,-65534,94,29,0,0,"",0,0,0,0,294,'',[
+minilines(94,29,0,0,1,0,0,[
+mini_line(94,24,5,0,0,0,[
+str_block(0,94,24,5,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,138240,94,24,5,0,-1,0,0,0,0,0,
+ "d67a598")])
+])
+])]))
+])
+],
+157,0,0,[
+]).
+poly('Black','',2,[
+ 1150,290,1050,290],1,3,1,182,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
+poly('Black','',2,[
+ 1150,290,800,430],1,3,1,183,0,1,0,0,0,0,0,'3',0,0,
+ "0","",[
+ 0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
+]).
diff --git a/branchmerge.tex b/branchmerge.tex
index 2868ee4..9e6f9a8 100644
--- a/branchmerge.tex
+++ b/branchmerge.tex
@@ -73,6 +73,24 @@
%======================================================================
+\frame{\frametitle{Exemple de fusion avec \ext{merge}}
+ \framesubtitle{Avant la fusion}
+ \includegraphics[scale=.37]{beforemerge.eps}\\
+ \mygitplus{git checkout master}\\
+ \mygitplus{git merge nouveau}\\
+% \mygit{git branch}{gitbranch3.txt}
+}
+
+%======================================================================
+
+\frame{\frametitle{Exemple de fusion avec \ext{merge}}
+ \framesubtitle{Après la fusion}
+ \includegraphics[scale=.37]{aftermerge.eps}
+ \vspace*{1.01cm}
+}
+
+%======================================================================
+
\frame{\frametitle{Fonctionnement}
\begin{itemize}
\item
--
GitLab