Skip to content

Instantly share code, notes, and snippets.

@Lobbyra

Lobbyra/nouveau.drawio

Created September 10, 2025 12:53
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save Lobbyra/bdf9b3919b55bdcb95f0fc6ab2fbf8f2 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save Lobbyra/bdf9b3919b55bdcb95f0fc6ab2fbf8f2 to your computer and use it in GitHub Desktop.
Download ZIP
ouaiouaiouai
Raw
nouveau.drawio
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:142.0) Gecko/20100101 Firefox/142.0" version="28.2.0">
<diagram name="ACTUEL" id="FyFq-2kfXTpWsAiSBSE5">
<mxGraphModel dx="1722" dy="949" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
<mxCell id="ILXAYd5S_T7aR1IVfI5M-1" value="&lt;strike&gt;main&lt;/strike&gt; develop" style="whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="330" y="340" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="ILXAYd5S_T7aR1IVfI5M-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;curved=1;" edge="1" parent="1" source="ILXAYd5S_T7aR1IVfI5M-2" target="ILXAYd5S_T7aR1IVfI5M-1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="ILXAYd5S_T7aR1IVfI5M-2" value="SFT-001" style="whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="190" y="510" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="ILXAYd5S_T7aR1IVfI5M-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;curved=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="ILXAYd5S_T7aR1IVfI5M-3">
<mxGeometry relative="1" as="geometry">
<mxPoint x="390" y="400" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="ILXAYd5S_T7aR1IVfI5M-3" value="SFT-002" style="whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="470" y="510" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="f8KPLipaaNIEqq_5EZpi-1" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="190" y="450" as="sourcePoint" />
<mxPoint x="590" y="450" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="f8KPLipaaNIEqq_5EZpi-2" value="Test en local" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="45" y="525" width="80" height="30" as="geometry" />
</mxCell>
<mxCell id="f8KPLipaaNIEqq_5EZpi-3" value="Création d&#39;une version" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="10" y="430" width="130" height="30" as="geometry" />
</mxCell>
<mxCell id="f8KPLipaaNIEqq_5EZpi-4" value="Test en environnement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="10" y="355" width="130" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-1" value="&lt;div align=&quot;center&quot;&gt;&lt;strike&gt;main&lt;/strike&gt;&amp;nbsp;develop&lt;/div&gt;" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;align=center;" vertex="1" parent="1">
<mxGeometry x="1181" y="210" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-10" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-2" target="xJavXP0gyin2YRMbvatF-1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-2" value="hotfix" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;align=center;" vertex="1" parent="1">
<mxGeometry x="1030" y="405" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-11" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-3" target="xJavXP0gyin2YRMbvatF-1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-3" value="dev" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;align=center;" vertex="1" parent="1">
<mxGeometry x="1340" y="405" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-9" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-4" target="xJavXP0gyin2YRMbvatF-2">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-4" value="SFT-001" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;align=center;" vertex="1" parent="1">
<mxGeometry x="1030" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-7" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-5" target="xJavXP0gyin2YRMbvatF-3">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-5" value="SFT-002" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;align=center;" vertex="1" parent="1">
<mxGeometry x="1240" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-8" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-6" target="xJavXP0gyin2YRMbvatF-3">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-6" value="SFT-003" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;align=center;" vertex="1" parent="1">
<mxGeometry x="1440" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-12" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="740" y="198" as="sourcePoint" />
<mxPoint x="740" y="692" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-13" value="Test en local" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="890" y="605" width="80" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-14" value="Test en local" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="890" y="420" width="80" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-16" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="1030" y="340" as="sourcePoint" />
<mxPoint x="1460" y="340" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-17" value="Création d&#39;une version" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="865" y="320" width="130" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-18" value="Test en environnement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="865" y="225" width="130" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-19" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;curved=1;" edge="1" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="1630" y="220" as="sourcePoint" />
<mxPoint x="1630" y="640" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-20" value="&lt;div align=&quot;center&quot;&gt;&lt;strike&gt;main&lt;/strike&gt;&amp;nbsp;develop&lt;/div&gt;&amp;nbsp;(1.1.5)" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;align=center;" vertex="1" parent="1">
<mxGeometry x="2290" y="215" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-41" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-21" target="xJavXP0gyin2YRMbvatF-20">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-21" value="1.1.6-a&lt;br&gt;(3 SFT-XXX P2)" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="2080" y="412.5" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-42" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-22" target="xJavXP0gyin2YRMbvatF-20">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-22" value="&lt;div&gt;1.1.6-b&lt;/div&gt;&lt;div&gt;(5 SFT-XXX P3)&lt;/div&gt;" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="2290" y="412.5" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-43" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-23" target="xJavXP0gyin2YRMbvatF-20">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-23" value="1.1.6-c&lt;br&gt;(1 SFT-XXX hotfix)" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="2510" y="412.5" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-31" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-24" target="xJavXP0gyin2YRMbvatF-21">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-24" value="SFT-XXX" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1940" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-30" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-25" target="xJavXP0gyin2YRMbvatF-21">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-25" value="SFT-XXX" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="2100" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-38" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-27" target="xJavXP0gyin2YRMbvatF-22">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-27" value="SFT-XXX" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="2285" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-39" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-28" target="xJavXP0gyin2YRMbvatF-22">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-28" value="...." style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="2435" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-40" style="edgeStyle=orthogonalEdgeStyle;shape=connector;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-29" target="xJavXP0gyin2YRMbvatF-23">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-29" value="SFT-XXX" style="whiteSpace=wrap;html=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="2640" y="590" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-32" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="1900" y="345" as="sourcePoint" />
<mxPoint x="2720" y="345" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-33" value="Création d&#39;une version" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1720" y="330" width="130" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-36" value="Test en local" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1740" y="427.5" width="80" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-37" value="Test en local" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1740" y="605" width="80" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-47" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-148">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="827" y="1060" as="sourcePoint" />
<mxPoint x="1620" y="1060" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-48" value="&lt;strike&gt;main&lt;/strike&gt; develop" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="740" y="1048" width="90" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-53" value="dev" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="770" y="1169" width="40" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-54" value="US-001" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="755" y="1232" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-55" value="US-002" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="755" y="1294" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-56" value="US-003" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="755" y="1354" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-57" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1000" y="1359" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-58" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1035" y="1299" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-59" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1075" y="1237" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-61" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1" target="xJavXP0gyin2YRMbvatF-52">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="855" y="1063.0000000000002" as="sourcePoint" />
<mxPoint x="1620" y="1060" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-52" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="920" y="1053" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-84" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-62" target="xJavXP0gyin2YRMbvatF-67">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-62" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="955" y="1174" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-63" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;curved=1;exitX=0.483;exitY=0.817;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-52" target="xJavXP0gyin2YRMbvatF-62">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="880" y="1210" as="sourcePoint" />
<mxPoint x="980" y="1210" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-64" style="shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.108;entryY=0.508;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-62" target="xJavXP0gyin2YRMbvatF-57">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-65" style="shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.108;entryY=0.55;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-62" target="xJavXP0gyin2YRMbvatF-58">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-66" style="shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.192;entryY=0.717;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-62" target="xJavXP0gyin2YRMbvatF-59">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-82" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-67" target="xJavXP0gyin2YRMbvatF-68">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-67" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1145" y="1174" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-83" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-68" target="xJavXP0gyin2YRMbvatF-69">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-68" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1205" y="1174" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-69" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1265" y="1174" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-77" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-52" target="xJavXP0gyin2YRMbvatF-76">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="930" y="1063" as="sourcePoint" />
<mxPoint x="1620" y="1060" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-76" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1330" y="1053" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-78" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.692;entryY=0.717;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-59" target="xJavXP0gyin2YRMbvatF-67">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-79" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.817;entryY=0.55;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-58" target="xJavXP0gyin2YRMbvatF-68">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-80" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.817;entryY=0.8;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-57" target="xJavXP0gyin2YRMbvatF-69">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-81" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.608;entryY=0.983;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-69" target="xJavXP0gyin2YRMbvatF-76">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-85" value="1.1.5" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="905" y="1008" width="50" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-86" value="1.1.6" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1315" y="1008" width="50" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-87" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" source="xJavXP0gyin2YRMbvatF-136" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="1345" y="1835" as="sourcePoint" />
<mxPoint x="1885" y="1835" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-88" value="&lt;strike&gt;main&lt;/strike&gt; develop" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="745" y="1820" width="90" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-89" value="dev" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="770" y="1930" width="40" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-90" value="US-001" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="755" y="1993" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-91" value="US-002" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="755" y="2055" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-92" value="US-003" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="755" y="2115" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-93" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1000" y="2120" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-94" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1035" y="2060" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-95" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1075" y="1998" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-96" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" target="xJavXP0gyin2YRMbvatF-97" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="860" y="1835.0000000000002" as="sourcePoint" />
<mxPoint x="1625" y="1832" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-97" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="925" y="1825" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-98" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-99" target="xJavXP0gyin2YRMbvatF-105" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-99" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="955" y="1935" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-100" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;curved=1;exitX=0.483;exitY=0.817;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" source="xJavXP0gyin2YRMbvatF-97" target="xJavXP0gyin2YRMbvatF-99" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="885" y="1982" as="sourcePoint" />
<mxPoint x="985" y="1982" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-101" style="shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.108;entryY=0.508;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-99" target="xJavXP0gyin2YRMbvatF-93" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-102" style="shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.108;entryY=0.55;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-99" target="xJavXP0gyin2YRMbvatF-94" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-103" style="shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.192;entryY=0.717;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-99" target="xJavXP0gyin2YRMbvatF-95" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-104" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-105" target="xJavXP0gyin2YRMbvatF-107" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-105" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1145" y="1935" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-106" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-107" target="xJavXP0gyin2YRMbvatF-108" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-107" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1205" y="1935" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-108" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1265" y="1935" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-109" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" source="xJavXP0gyin2YRMbvatF-119" parent="1">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="935" y="1835" as="sourcePoint" />
<mxPoint x="1345" y="1835" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-111" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.692;entryY=0.717;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-95" target="xJavXP0gyin2YRMbvatF-105" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-112" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.817;entryY=0.55;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-94" target="xJavXP0gyin2YRMbvatF-107" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-113" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.817;entryY=0.8;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" source="xJavXP0gyin2YRMbvatF-93" target="xJavXP0gyin2YRMbvatF-108" parent="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-115" value="1.1.5" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="910" y="1780" width="50" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-117" value="hotfix" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="760" y="1878" width="50" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-118" value="US-004 (fix P1)" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="715" y="2180" width="100" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-120" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1435" y="2185" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-121" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1325" y="1880" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-131" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-122" target="xJavXP0gyin2YRMbvatF-123">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-122" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1495" y="1880" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-123" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1595" y="1880" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-125" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-97" target="xJavXP0gyin2YRMbvatF-119">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="935" y="1835" as="sourcePoint" />
<mxPoint x="1345" y="1835" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-127" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-119" target="xJavXP0gyin2YRMbvatF-126">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-119" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="975" y="1825" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-126" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1045" y="1880" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-128" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.067;entryY=0.258;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-126" target="xJavXP0gyin2YRMbvatF-121">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-129" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.858;entryY=0.633;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-121" target="xJavXP0gyin2YRMbvatF-120">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-130" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.608;entryY=0.717;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-120" target="xJavXP0gyin2YRMbvatF-122">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-134" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1" target="xJavXP0gyin2YRMbvatF-133">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="1345" y="1835" as="sourcePoint" />
<mxPoint x="1885" y="1832" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-133" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1675" y="1825" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-135" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.525;entryY=0.925;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-123" target="xJavXP0gyin2YRMbvatF-133">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-137" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-133" target="xJavXP0gyin2YRMbvatF-136">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="1685" y="1835" as="sourcePoint" />
<mxPoint x="1885" y="1832" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-136" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1815" y="1825" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-138" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1725" y="1935" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-139" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.275;entryY=0.425;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-108" target="xJavXP0gyin2YRMbvatF-138">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-140" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.692;entryY=0.883;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-138" target="xJavXP0gyin2YRMbvatF-136">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-141" value="1.1.6" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1660" y="1780" width="50" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-142" value="1.1.7" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1800" y="1780" width="50" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-143" value="SCÉNARIO 2" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1245" y="1718" width="90" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-144" value="SCÉNARIO 1" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1240" y="950" width="90" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-146" value="hotfix" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="765" y="1108" width="50" height="30" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-147" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;endFill=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-151">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="855" y="1122.58" as="sourcePoint" />
<mxPoint x="1620" y="1122" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-149" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;curved=1;endFill=0;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-76" target="xJavXP0gyin2YRMbvatF-148">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="1340" y="1063" as="sourcePoint" />
<mxPoint x="1620" y="1060" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-153" style="edgeStyle=none;shape=connector;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=classic;" edge="1" parent="1" source="xJavXP0gyin2YRMbvatF-148" target="xJavXP0gyin2YRMbvatF-151">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-148" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1390" y="1053" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-152" value="" style="edgeStyle=none;orthogonalLoop=1;jettySize=auto;html=1;rounded=0;strokeColor=default;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;endArrow=none;endFill=0;" edge="1" parent="1" target="xJavXP0gyin2YRMbvatF-151">
<mxGeometry width="100" relative="1" as="geometry">
<mxPoint x="855" y="1122.58" as="sourcePoint" />
<mxPoint x="1620" y="1122" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="xJavXP0gyin2YRMbvatF-151" value="" style="shape=waypoint;sketch=0;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;fontFamily=Helvetica;fontSize=11;fontColor=default;labelBackgroundColor=default;" vertex="1" parent="1">
<mxGeometry x="1470" y="1113" width="20" height="20" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
Raw
nouveau.md

Étude amélioration Gitflow sengager.fr

Sommaire

Gitflow actuel

SCHEMA 1

Fonctionnement

1 - Création d'une branche liée à l'US à partir de develop 2 - Réalisation de l'US et tests en local 3 - Merge de la branche de l'US sur develop

Problématique

1 - Merge en série. Si on merge une fonctionnalité et qu'on doit merger une hotfix. On est obligé de push la fonctionnalité. 2 - Pour chaque merge ca créer une nouvelle version

Proposition - Feature / hotfix

Pour corriger ces problèmes, une solution est de passer à une organisation plus conventionnelle avec des branches Main, Hotfix et Dev.

SCHEMA 2

Avant la branche develop (qui est en fait une branche main), il faut créer une branche dev et une branche hotfix.

  • main develop : Branche principale qui reçoit des commits pour chaque nouvelle version
  • hotfix : Branche qui sert à recevoir les corrections prioritaires
  • dev : Branche par defaut vers laquelle on va merge les US

La création d'une version se fera lors du merge entre dev et develop ou entre hotfix et develop.

Scénario 1 - Normal

SCHEMA 2 SCÉNARIO 1

  • 3 branches spécifiques à des US doivent être mergées venant de la branche dev
  • Après les reviews, les branches sont mergés sur dev
  • Merge de la branche dev vers develop, et donc création de version
  • (optionnel) Merge la branche develop sur la branche hotfix pour mettre à jour cette branche

Scénario 2 - Hotfix

SCHEMA 2 SCÉNARIO 2

  • 3 branches spécifiques à des US doivent être mergés venant de la branche dev
  • 1 US de correction P1 est créée
  • Création d'une branche à partir de la branche hotfix, réalisation de l'US et review
  • Merge de la branche d'US sur la branche hotfix
  • Merge de la branche hotfix sur la branche develop et création de version
  • Merge des 3 branches sur la branche dev
  • Merge de la branche dev sur develop et création d'une version
  • (optionnel) Merge la branche develop sur dev pour mettre à jour la branche dev

Le fonctionnement de ces deux scénarios règlent les problématiques du fonctionnement actuel, sans compromis.

Migration vers la proposition

  1. Suspendre la création de branches à partir de la branche develop
  2. Création d'une branche dev qui doit dorénavant être la branche par défaut
  3. Création d'une branche hotfix à partir de la branche develop

Pas de modification de la CI ou autre processus automatisé.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment