From 9eb8b786c4a32ec2ed8f092f2ff9a611a494e56c Mon Sep 17 00:00:00 2001
From: Philippe Dosch <Philippe.Dosch@loria.fr>
Date: Mon, 6 Jan 2014 21:16:48 +0100
Subject: [PATCH] Adds the environment figure before a merge/rebase process
---
beforemerge.obj | 338 ++++++++++++++++++++++++++++++++++++++++++++++++
branchmerge.tex | 16 +++
2 files changed, 354 insertions(+)
create mode 100644 beforemerge.obj
diff --git a/beforemerge.obj b/beforemerge.obj
new file mode 100644
index 0000000..f598f6a
--- /dev/null
+++ b/beforemerge.obj
@@ -0,0 +1,338 @@
+%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,[
+ 900,276,900,314,900,330,916,330,1034,330,1050,330,1050,314,1050,276,
+ 1050,260,1034,260,916,260,900,260,900,276],1,1,1,0,0,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',904,264,1046,326,1,1,0,1,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',975,263,1,1,1,144,15,2,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,275,'',[
+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',974,280,1,1,1,93,29,3,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,304,'',[
+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,[
+ 400,346,400,384,400,400,416,400,534,400,550,400,550,384,550,346,
+ 550,330,534,330,416,330,400,330,400,346],1,1,1,0,33,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',404,334,546,396,1,1,0,34,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',475,333,1,1,1,144,15,35,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,345,'',[
+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',474,350,1,1,1,93,29,36,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,374,'',[
+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,[
+ 650,346,650,384,650,400,666,400,784,400,800,400,800,384,800,346,
+ 800,330,784,330,666,330,650,330,650,346],1,1,1,0,43,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',654,334,796,396,1,1,0,44,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',725,333,1,1,1,144,15,45,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,345,'',[
+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',724,350,1,1,1,93,29,46,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,374,'',[
+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,[
+ 1150,590,1050,590],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,[
+ 650,370,550,370],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,126,1150,164,1150,180,1166,180,1284,180,1300,180,1300,164,1300,126,
+ 1300,110,1284,110,1166,110,1150,110,1150,126],1,1,1,0,75,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#ff8000','',1154,114,1296,176,1,1,0,76,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',1225,113,1,1,1,144,15,77,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,125,'',[
+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,130,1,1,1,81,29,78,24,5,0,0,0,0,-65534,81,29,0,0,"",0,0,0,0,154,'',[
+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,180,1230,260],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,[
+ 400,370,300,370],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,[
+ 900,566,900,604,900,620,916,620,1034,620,1050,620,1050,604,1050,566,
+ 1050,550,1034,550,916,550,900,550,900,566],1,1,1,0,98,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#ff8000','',904,554,1046,616,1,1,0,99,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',975,553,1,1,1,144,15,100,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,565,'',[
+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',974,570,1,1,1,101,29,101,24,5,0,0,0,0,-65534,101,29,0,0,"",0,0,0,0,594,'',[
+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,[
+ 980,550,980,470],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,[
+ 1150,566,1150,604,1150,620,1166,620,1284,620,1300,620,1300,604,1300,566,
+ 1300,550,1284,550,1166,550,1150,550,1150,566],1,1,1,0,111,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#7da647','',1154,554,1296,616,1,1,0,112,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',1225,553,1,1,1,144,15,113,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,565,'',[
+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',1225,570,1,1,1,72,29,114,24,5,0,0,0,0,-65534,72,29,0,0,"",0,0,0,0,594,'',[
+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,[
+ 1150,300,1050,300],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,[
+ 900,416,900,454,900,470,916,470,1034,470,1050,470,1050,454,1050,416,
+ 1050,400,1034,400,916,400,900,400,900,416],1,1,1,0,139,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',904,404,1046,466,1,1,0,140,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',975,403,1,1,1,144,15,141,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,415,'',[
+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',974,420,1,1,1,95,29,142,24,5,0,0,0,0,-65534,95,29,0,0,"",0,0,0,0,444,'',[
+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,[
+ 1150,276,1150,314,1150,330,1166,330,1284,330,1300,330,1300,314,1300,276,
+ 1300,260,1284,260,1166,260,1150,260,1150,276],1,1,1,0,150,0,0,0,0,0,'1',0,
+ "2490",[
+]),
+box('#0099ff','',1154,264,1296,326,1,1,0,151,0,0,0,0,0,'1',0,[
+attr("", "auto_center_attr", 0, 1, 0,
+text('#0099ff',1225,263,1,1,1,144,15,152,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,275,'',[
+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',1225,280,1,1,1,92,29,153,24,5,0,0,0,0,-65534,92,29,0,0,"",0,0,0,0,304,'',[
+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,[
+ 900,300,800,360],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,[
+ 900,430,800,370],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'],[
+]).
diff --git a/branchmerge.tex b/branchmerge.tex
index da5c423..0390849 100644
--- a/branchmerge.tex
+++ b/branchmerge.tex
@@ -8,6 +8,22 @@
%======================================================================
+\frame{\frametitle{Introduction}
+ \begin{itemize}
+ \item
+ Une fois que le développement relatif à la nouvelle branche est
+ terminé, on peut l'intégrer dans la branche de base
+ \item
+ Dans le même temps, il est possible que le développement ait
+ continué dans la branche de base
+ \end{itemize}
+ \begin{center}
+ \includegraphics[scale=.4]{beforemerge.eps}
+ \end{center}
+}
+
+%======================================================================
+
\frame{\frametitle{Introduction}
\begin{itemize}
\item
--
GitLab