Last active
July 22, 2018 12:26
-
-
Save pulkitsinghal/641a5e1782ccce52ebfd01e01cdb42d2 to your computer and use it in GitHub Desktop.
Workflow for a Hotfix in Git
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <svg id="mermaid-1532262138350" width="100%" xmlns="http://www.w3.org/2000/svg" style="max-width: 803.9453125px;" viewBox="0 0 803.9453125 393"><style> | |
| #mermaid-1532262138350 .label { | |
| font-family: 'trebuchet ms', verdana, arial; | |
| color: #333; } | |
| #mermaid-1532262138350 .node rect, | |
| #mermaid-1532262138350 .node circle, | |
| #mermaid-1532262138350 .node ellipse, | |
| #mermaid-1532262138350 .node polygon { | |
| fill: #ECECFF; | |
| stroke: #9370DB; | |
| stroke-width: 1px; } | |
| #mermaid-1532262138350 .node.clickable { | |
| cursor: pointer; } | |
| #mermaid-1532262138350 .arrowheadPath { | |
| fill: #333333; } | |
| #mermaid-1532262138350 .edgePath .path { | |
| stroke: #333333; | |
| stroke-width: 1.5px; } | |
| #mermaid-1532262138350 .edgeLabel { | |
| background-color: #e8e8e8; } | |
| #mermaid-1532262138350 .cluster rect { | |
| fill: #ffffde !important; | |
| stroke: #aaaa33 !important; | |
| stroke-width: 1px !important; } | |
| #mermaid-1532262138350 .cluster text { | |
| fill: #333; } | |
| #mermaid-1532262138350 div.mermaidTooltip { | |
| position: absolute; | |
| text-align: center; | |
| max-width: 200px; | |
| padding: 2px; | |
| font-family: 'trebuchet ms', verdana, arial; | |
| font-size: 12px; | |
| background: #ffffde; | |
| border: 1px solid #aaaa33; | |
| border-radius: 2px; | |
| pointer-events: none; | |
| z-index: 100; } | |
| #mermaid-1532262138350 .actor { | |
| stroke: #CCCCFF; | |
| fill: #ECECFF; } | |
| #mermaid-1532262138350 text.actor { | |
| fill: black; | |
| stroke: none; } | |
| #mermaid-1532262138350 .actor-line { | |
| stroke: grey; } | |
| #mermaid-1532262138350 .messageLine0 { | |
| stroke-width: 1.5; | |
| stroke-dasharray: '2 2'; | |
| marker-end: 'url(#arrowhead)'; | |
| stroke: #333; } | |
| #mermaid-1532262138350 .messageLine1 { | |
| stroke-width: 1.5; | |
| stroke-dasharray: '2 2'; | |
| stroke: #333; } | |
| #mermaid-1532262138350 #arrowhead { | |
| fill: #333; } | |
| #mermaid-1532262138350 #crosshead path { | |
| fill: #333 !important; | |
| stroke: #333 !important; } | |
| #mermaid-1532262138350 .messageText { | |
| fill: #333; | |
| stroke: none; } | |
| #mermaid-1532262138350 .labelBox { | |
| stroke: #CCCCFF; | |
| fill: #ECECFF; } | |
| #mermaid-1532262138350 .labelText { | |
| fill: black; | |
| stroke: none; } | |
| #mermaid-1532262138350 .loopText { | |
| fill: black; | |
| stroke: none; } | |
| #mermaid-1532262138350 .loopLine { | |
| stroke-width: 2; | |
| stroke-dasharray: '2 2'; | |
| marker-end: 'url(#arrowhead)'; | |
| stroke: #CCCCFF; } | |
| #mermaid-1532262138350 .note { | |
| stroke: #aaaa33; | |
| fill: #fff5ad; } | |
| #mermaid-1532262138350 .noteText { | |
| fill: black; | |
| stroke: none; | |
| font-family: 'trebuchet ms', verdana, arial; | |
| font-size: 14px; } | |
| #mermaid-1532262138350 .section { | |
| stroke: none; | |
| opacity: 0.2; } | |
| #mermaid-1532262138350 .section0 { | |
| fill: rgba(102, 102, 255, 0.49); } | |
| #mermaid-1532262138350 .section2 { | |
| fill: #fff400; } | |
| #mermaid-1532262138350 .section1, | |
| #mermaid-1532262138350 .section3 { | |
| fill: white; | |
| opacity: 0.2; } | |
| #mermaid-1532262138350 .sectionTitle0 { | |
| fill: #333; } | |
| #mermaid-1532262138350 .sectionTitle1 { | |
| fill: #333; } | |
| #mermaid-1532262138350 .sectionTitle2 { | |
| fill: #333; } | |
| #mermaid-1532262138350 .sectionTitle3 { | |
| fill: #333; } | |
| #mermaid-1532262138350 .sectionTitle { | |
| text-anchor: start; | |
| font-size: 11px; | |
| text-height: 14px; } | |
| #mermaid-1532262138350 .grid .tick { | |
| stroke: lightgrey; | |
| opacity: 0.3; | |
| shape-rendering: crispEdges; } | |
| #mermaid-1532262138350 .grid path { | |
| stroke-width: 0; } | |
| #mermaid-1532262138350 .today { | |
| fill: none; | |
| stroke: red; | |
| stroke-width: 2px; } | |
| #mermaid-1532262138350 .task { | |
| stroke-width: 2; } | |
| #mermaid-1532262138350 .taskText { | |
| text-anchor: middle; | |
| font-size: 11px; } | |
| #mermaid-1532262138350 .taskTextOutsideRight { | |
| fill: black; | |
| text-anchor: start; | |
| font-size: 11px; } | |
| #mermaid-1532262138350 .taskTextOutsideLeft { | |
| fill: black; | |
| text-anchor: end; | |
| font-size: 11px; } | |
| #mermaid-1532262138350 .taskText0, | |
| #mermaid-1532262138350 .taskText1, | |
| #mermaid-1532262138350 .taskText2, | |
| #mermaid-1532262138350 .taskText3 { | |
| fill: white; } | |
| #mermaid-1532262138350 .task0, | |
| #mermaid-1532262138350 .task1, | |
| #mermaid-1532262138350 .task2, | |
| #mermaid-1532262138350 .task3 { | |
| fill: #8a90dd; | |
| stroke: #534fbc; } | |
| #mermaid-1532262138350 .taskTextOutside0, | |
| #mermaid-1532262138350 .taskTextOutside2 { | |
| fill: black; } | |
| #mermaid-1532262138350 .taskTextOutside1, | |
| #mermaid-1532262138350 .taskTextOutside3 { | |
| fill: black; } | |
| #mermaid-1532262138350 .active0, | |
| #mermaid-1532262138350 .active1, | |
| #mermaid-1532262138350 .active2, | |
| #mermaid-1532262138350 .active3 { | |
| fill: #bfc7ff; | |
| stroke: #534fbc; } | |
| #mermaid-1532262138350 .activeText0, | |
| #mermaid-1532262138350 .activeText1, | |
| #mermaid-1532262138350 .activeText2, | |
| #mermaid-1532262138350 .activeText3 { | |
| fill: black !important; } | |
| #mermaid-1532262138350 .done0, | |
| #mermaid-1532262138350 .done1, | |
| #mermaid-1532262138350 .done2, | |
| #mermaid-1532262138350 .done3 { | |
| stroke: grey; | |
| fill: lightgrey; | |
| stroke-width: 2; } | |
| #mermaid-1532262138350 .doneText0, | |
| #mermaid-1532262138350 .doneText1, | |
| #mermaid-1532262138350 .doneText2, | |
| #mermaid-1532262138350 .doneText3 { | |
| fill: black !important; } | |
| #mermaid-1532262138350 .crit0, | |
| #mermaid-1532262138350 .crit1, | |
| #mermaid-1532262138350 .crit2, | |
| #mermaid-1532262138350 .crit3 { | |
| stroke: #ff8888; | |
| fill: red; | |
| stroke-width: 2; } | |
| #mermaid-1532262138350 .activeCrit0, | |
| #mermaid-1532262138350 .activeCrit1, | |
| #mermaid-1532262138350 .activeCrit2, | |
| #mermaid-1532262138350 .activeCrit3 { | |
| stroke: #ff8888; | |
| fill: #bfc7ff; | |
| stroke-width: 2; } | |
| #mermaid-1532262138350 .doneCrit0, | |
| #mermaid-1532262138350 .doneCrit1, | |
| #mermaid-1532262138350 .doneCrit2, | |
| #mermaid-1532262138350 .doneCrit3 { | |
| stroke: #ff8888; | |
| fill: lightgrey; | |
| stroke-width: 2; | |
| cursor: pointer; | |
| shape-rendering: crispEdges; } | |
| #mermaid-1532262138350 .doneCritText0, | |
| #mermaid-1532262138350 .doneCritText1, | |
| #mermaid-1532262138350 .doneCritText2, | |
| #mermaid-1532262138350 .doneCritText3 { | |
| fill: black !important; } | |
| #mermaid-1532262138350 .activeCritText0, | |
| #mermaid-1532262138350 .activeCritText1, | |
| #mermaid-1532262138350 .activeCritText2, | |
| #mermaid-1532262138350 .activeCritText3 { | |
| fill: black !important; } | |
| #mermaid-1532262138350 .titleText { | |
| text-anchor: middle; | |
| font-size: 18px; | |
| fill: black; } | |
| #mermaid-1532262138350 g.classGroup text { | |
| fill: #9370DB; | |
| stroke: none; | |
| font-family: 'trebuchet ms', verdana, arial; | |
| font-size: 10px; } | |
| #mermaid-1532262138350 g.classGroup rect { | |
| fill: #ECECFF; | |
| stroke: #9370DB; } | |
| #mermaid-1532262138350 g.classGroup line { | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 .classLabel .box { | |
| stroke: none; | |
| stroke-width: 0; | |
| fill: #ECECFF; | |
| opacity: 0.5; } | |
| #mermaid-1532262138350 .classLabel .label { | |
| fill: #9370DB; | |
| font-size: 10px; } | |
| #mermaid-1532262138350 .relation { | |
| stroke: #9370DB; | |
| stroke-width: 1; | |
| fill: none; } | |
| #mermaid-1532262138350 #compositionStart { | |
| fill: #9370DB; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 #compositionEnd { | |
| fill: #9370DB; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 #aggregationStart { | |
| fill: #ECECFF; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 #aggregationEnd { | |
| fill: #ECECFF; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 #dependencyStart { | |
| fill: #9370DB; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 #dependencyEnd { | |
| fill: #9370DB; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 #extensionStart { | |
| fill: #9370DB; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 #extensionEnd { | |
| fill: #9370DB; | |
| stroke: #9370DB; | |
| stroke-width: 1; } | |
| #mermaid-1532262138350 .commit-id, | |
| #mermaid-1532262138350 .commit-msg, | |
| #mermaid-1532262138350 .branch-label { | |
| fill: lightgrey; | |
| color: lightgrey; } | |
| </style><style>#mermaid-1532262138350 { | |
| color: rgba(0, 0, 0, 0.65); | |
| font: normal normal 400 normal 14px / 21px "Monospaced Number", "Chinese Quote", -apple-system, system-ui, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif; | |
| }</style><g transform="translate(-12, -12)"><g class="output"><g class="clusters"></g><g class="edgePaths"><g class="edgePath" style="opacity: 1;"><path class="path" d="M430.5078125,61L430.5078125,96.5L430.5078125,132" marker-end="url(#arrowhead11568)" style="fill:none"></path><defs><marker id="arrowhead11568" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M497.0390625,142.2076995637307L563.0234375,132L579.51953125,132L596.015625,152.5L579.51953125,173L563.0234375,173L497.0390625,162.7923004362693" marker-end="url(#arrowhead11569)" style="fill:none"></path><defs><marker id="arrowhead11569" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M497.0390625,146.5995696356549L661.6588541666666,132L702.8138020833334,132L743.96875,152.5L702.8138020833334,173L661.6588541666666,173L497.0390625,158.4004303643451" marker-end="url(#arrowhead11570)" style="fill:none"></path><defs><marker id="arrowhead11570" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M186.1796875,173L186.1796875,208.5L263.6229771205357,244" marker-end="url(#arrowhead11571)" style="fill:none"></path><defs><marker id="arrowhead11571" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M430.5078125,173L430.5078125,208.5L353.0645228794643,244" marker-end="url(#arrowhead11572)" style="fill:none"></path><defs><marker id="arrowhead11572" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M258.6953125,283.81506105834467L164.3984375,320.5L164.3984375,356" marker-end="url(#arrowhead11573)" style="fill:none"></path><defs><marker id="arrowhead11573" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g><g class="edgePath" style="opacity: 1;"><path class="path" d="M357.9921875,283.81506105834467L452.2890625,320.5L452.2890625,356" marker-end="url(#arrowhead11574)" style="fill:none"></path><defs><marker id="arrowhead11574" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="6" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z" class="arrowheadPath" style="stroke-width: 1; stroke-dasharray: 1, 0;"></path></marker></defs></g></g><g class="edgeLabels"><g class="edgeLabel" transform="translate(430.5078125,96.5)" style="opacity: 1;"><g transform="translate(-151.1328125,-10.5)" class="label"><foreignObject width="302.265625" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">step 1 - `git flow release start RELEASE BASE`</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(596.015625,152.5)" style="opacity: 1;"><g transform="translate(-63.9765625,-10.5)" class="label"><foreignObject width="127.953125" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">step 1.1 - merge PR</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(743.96875,152.5)" style="opacity: 1;"><g transform="translate(-63.9765625,-10.5)" class="label"><foreignObject width="127.953125" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">step 1.2 - merge PR</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(186.1796875,208.5)" style="opacity: 1;"><g transform="translate(-166.1796875,-10.5)" class="label"><foreignObject width="332.359375" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">step 2 - `git flow hotfix start VERSION BASENAME`</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(430.5078125,208.5)" style="opacity: 1;"><g transform="translate(-58.1484375,-10.5)" class="label"><foreignObject width="116.296875" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">step 3 - merge PR</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(164.3984375,320.5)" style="opacity: 1;"><g transform="translate(-133.9453125,-10.5)" class="label"><foreignObject width="267.890625" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">step 4 - `git flow release finish RELEASE`</span></div></foreignObject></g></g><g class="edgeLabel" transform="translate(452.2890625,320.5)" style="opacity: 1;"><g transform="translate(-133.9453125,-10.5)" class="label"><foreignObject width="267.890625" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;"><span class="edgeLabel">step 5 - `git flow release finish RELEASE`</span></div></foreignObject></g></g></g><g class="nodes"><g class="node" id="dev" transform="translate(430.5078125,40.5)" style="opacity: 1;"><rect rx="5" ry="5" x="-64.890625" y="-20.5" width="129.78125" height="41"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-54.890625,-10.5)"><foreignObject width="109.78125" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">develop - v.A.B.C</div></foreignObject></g></g></g><g class="node" id="release" transform="translate(430.5078125,152.5)" style="opacity: 1;"><rect rx="5" ry="5" x="-66.53125" y="-20.5" width="133.0625" height="41"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-56.53125,-10.5)"><foreignObject width="113.0625" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">release/X.Y.Z-rcN</div></foreignObject></g></g></g><g class="node" id="master" transform="translate(186.1796875,152.5)" style="opacity: 1;"><rect rx="5" ry="5" x="-59.2734375" y="-20.5" width="118.546875" height="41"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-49.2734375,-10.5)"><foreignObject width="98.546875" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">master - vA.B.C</div></foreignObject></g></g></g><g class="node" id="hotfix" transform="translate(308.34375,264.5)" style="opacity: 1;"><rect rx="5" ry="5" x="-49.6484375" y="-20.5" width="99.296875" height="41"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-39.6484375,-10.5)"><foreignObject width="79.296875" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">hotfix/A.B.D</div></foreignObject></g></g></g><g class="node" id="masterNew" transform="translate(164.3984375,376.5)" style="opacity: 1;"><rect rx="0" ry="0" x="-61.953125" y="-20.5" width="123.90625" height="41"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-51.953125,-10.5)"><foreignObject width="103.90625" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">master - v.A.B.D</div></foreignObject></g></g></g><g class="node" id="developNew" transform="translate(452.2890625,376.5)" style="opacity: 1;"><rect rx="0" ry="0" x="-65" y="-20.5" width="130" height="41"></rect><g class="label" transform="translate(0,0)"><g transform="translate(-55,-10.5)"><foreignObject width="110" height="21"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">develop - v.A.B.D</div></foreignObject></g></g></g></g></g></g></svg> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment