image/merge-or-rebase-workflow.svg

<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Generated by graphviz version 2.38.0 (20140413.2041)
 -->
<!-- Title: mergeorrebaseworkflow Pages: 1 -->
<svg width="409pt" height="415pt"
 viewBox="0.00 0.00 409.17 414.94" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 410.938)">
<title>mergeorrebaseworkflow</title>
<polygon fill="white" stroke="none" points="-4,4 -4,-410.938 405.167,-410.938 405.167,4 -4,4"/>
<!-- merge_or_rebase_workflow -->
<g id="node1" class="node"><title>merge_or_rebase_workflow</title>
<polygon fill="lightyellow" stroke="black" points="-0.128187,-370.336 110.128,-351.031 220.384,-370.336 220.281,-401.571 -0.0252761,-401.571 -0.128187,-370.336"/>
<text text-anchor="start" x="55.128" y="-382.369" font-family="Verdana" font-weight="bold" font-size="12.00">Merge or rebase</text>
<text text-anchor="start" x="78.628" y="-370.369" font-family="Verdana" font-weight="bold" font-size="12.00">workflow</text>
</g>
<!-- dont_make_me_think_decision -->
<g id="node4" class="node"><title>dont_make_me_think_decision</title>
<polygon fill="lightyellow" stroke="black" points="110.128,-314 37.387,-278 110.128,-242 182.869,-278 110.128,-314"/>
<text text-anchor="start" x="72.128" y="-281.4" font-family="Verdana" font-weight="bold" font-size="12.00">Don&#39;t make</text>
<text text-anchor="start" x="78.128" y="-269.4" font-family="Verdana" font-weight="bold" font-size="12.00">me think?</text>
</g>
<!-- merge_or_rebase_workflow&#45;&gt;dont_make_me_think_decision -->
<g id="edge1" class="edge"><title>merge_or_rebase_workflow&#45;&gt;dont_make_me_think_decision</title>
<path fill="none" stroke="black" d="M110.128,-350.925C110.128,-342.072 110.128,-332.003 110.128,-322.261"/>
<polygon fill="black" stroke="black" points="112.928,-322.189 110.128,-314.189 107.328,-322.189 112.928,-322.189"/>
</g>
<!-- joining_branches_decision -->
<g id="node2" class="node"><title>joining_branches_decision</title>
<polygon fill="lightyellow" stroke="black" points="110.128,-193 42.938,-157 110.128,-121 177.318,-157 110.128,-193"/>
<text text-anchor="start" x="87.128" y="-160.4" font-family="Verdana" font-weight="bold" font-size="12.00">Joining</text>
<text text-anchor="start" x="75.628" y="-148.4" font-family="Verdana" font-weight="bold" font-size="12.00">branches?</text>
</g>
<!-- editing_commits_decision -->
<g id="node3" class="node"><title>editing_commits_decision</title>
<polygon fill="lightyellow" stroke="black" points="110.128,-72 48.489,-36 110.128,-7.10543e-015 171.767,-36 110.128,-72"/>
<text text-anchor="start" x="87.628" y="-39.4" font-family="Verdana" font-weight="bold" font-size="12.00">Editing</text>
<text text-anchor="start" x="79.128" y="-27.4" font-family="Verdana" font-weight="bold" font-size="12.00">commits?</text>
</g>
<!-- joining_branches_decision&#45;&gt;editing_commits_decision -->
<g id="edge4" class="edge"><title>joining_branches_decision&#45;&gt;editing_commits_decision</title>
<path fill="none" stroke="black" d="M110.128,-120.94C110.128,-108.222 110.128,-93.7014 110.128,-80.3536"/>
<polygon fill="black" stroke="black" points="112.928,-80.2209 110.128,-72.2209 107.328,-80.221 112.928,-80.2209"/>
<text text-anchor="start" x="110.128" y="-94.4" font-family="Verdana" font-weight="bold" font-size="12.00"> &#160;&#160;no</text>
</g>
<!-- shared_branch_decision -->
<g id="node5" class="node"><title>shared_branch_decision</title>
<polygon fill="lightyellow" stroke="black" points="326.128,-193 251.049,-157 326.128,-121 401.207,-157 326.128,-193"/>
<text text-anchor="start" x="302.128" y="-166.4" font-family="Verdana" font-weight="bold" font-size="12.00">Shared</text>
<text text-anchor="start" x="303.128" y="-154.4" font-family="Verdana" font-weight="bold" font-size="12.00">branch</text>
<text text-anchor="start" x="292.128" y="-142.4" font-family="Verdana" font-weight="bold" font-size="12.00">(master)?</text>
</g>
<!-- joining_branches_decision&#45;&gt;shared_branch_decision -->
<g id="edge5" class="edge"><title>joining_branches_decision&#45;&gt;shared_branch_decision</title>
<path fill="none" stroke="black" d="M177.288,-157C197.933,-157 220.913,-157 242.518,-157"/>
<polygon fill="black" stroke="black" points="242.724,-159.8 250.724,-157 242.724,-154.2 242.724,-159.8"/>
<text text-anchor="start" x="202.656" y="-164.4" font-family="Verdana" font-weight="bold" font-size="12.00">yes</text>
</g>
<!-- git_rebase -->
<g id="node6" class="node"><title>git_rebase</title>
<polygon fill="lightyellow" stroke="black" points="399.628,-57 252.628,-57 252.628,-15 399.628,-15 399.628,-57"/>
<text text-anchor="start" x="301.628" y="-42.4" font-family="Verdana" font-weight="bold" font-size="12.00">Rebase</text>
<text text-anchor="start" x="263.128" y="-24.4" font-family="Verdana" font-size="12.00">git rebase &lt;branch&gt;</text>
</g>
<!-- editing_commits_decision&#45;&gt;git_rebase -->
<g id="edge6" class="edge"><title>editing_commits_decision&#45;&gt;git_rebase</title>
<path fill="none" stroke="black" d="M171.736,-36C194.366,-36 220.351,-36 244.47,-36"/>
<polygon fill="black" stroke="black" points="244.571,-38.8001 252.57,-36 244.57,-33.2001 244.571,-38.8001"/>
<text text-anchor="start" x="200.663" y="-43.4" font-family="Verdana" font-weight="bold" font-size="12.00">yes</text>
</g>
<!-- dont_make_me_think_decision&#45;&gt;joining_branches_decision -->
<g id="edge3" class="edge"><title>dont_make_me_think_decision&#45;&gt;joining_branches_decision</title>
<path fill="none" stroke="black" d="M110.128,-241.94C110.128,-229.222 110.128,-214.701 110.128,-201.354"/>
<polygon fill="black" stroke="black" points="112.928,-201.221 110.128,-193.221 107.328,-201.221 112.928,-201.221"/>
<text text-anchor="start" x="110.128" y="-215.4" font-family="Verdana" font-weight="bold" font-size="12.00"> &#160;&#160;no</text>
</g>
<!-- git_merge -->
<g id="node7" class="node"><title>git_merge</title>
<polygon fill="lightyellow" stroke="black" points="398.128,-299 254.128,-299 254.128,-257 398.128,-257 398.128,-299"/>
<text text-anchor="start" x="304.628" y="-284.4" font-family="Verdana" font-weight="bold" font-size="12.00">Merge</text>
<text text-anchor="start" x="264.128" y="-266.4" font-family="Verdana" font-size="12.00">git merge &lt;branch&gt;</text>
</g>
<!-- dont_make_me_think_decision&#45;&gt;git_merge -->
<g id="edge2" class="edge"><title>dont_make_me_think_decision&#45;&gt;git_merge</title>
<path fill="none" stroke="black" d="M182.955,-278C203.174,-278 225.239,-278 245.858,-278"/>
<polygon fill="black" stroke="black" points="245.984,-280.8 253.984,-278 245.984,-275.2 245.984,-280.8"/>
<text text-anchor="start" x="206.938" y="-285.4" font-family="Verdana" font-weight="bold" font-size="12.00">yes</text>
</g>
<!-- shared_branch_decision&#45;&gt;git_rebase -->
<g id="edge8" class="edge"><title>shared_branch_decision&#45;&gt;git_rebase</title>
<path fill="none" stroke="black" d="M326.128,-120.94C326.128,-103.308 326.128,-82.2116 326.128,-65.5789"/>
<polygon fill="black" stroke="black" points="328.928,-65.33 326.128,-57.3301 323.328,-65.3301 328.928,-65.33"/>
<text text-anchor="start" x="326.128" y="-94.4" font-family="Verdana" font-weight="bold" font-size="12.00"> &#160;&#160;no</text>
</g>
<!-- shared_branch_decision&#45;&gt;git_merge -->
<g id="edge7" class="edge"><title>shared_branch_decision&#45;&gt;git_merge</title>
<path fill="none" stroke="black" d="M326.128,-193.244C326.128,-210.895 326.128,-231.983 326.128,-248.584"/>
<polygon fill="black" stroke="black" points="323.328,-248.813 326.128,-256.813 328.928,-248.813 323.328,-248.813"/>
<text text-anchor="start" x="326.128" y="-215.4" font-family="Verdana" font-weight="bold" font-size="12.00"> &#160;&#160;yes</text>
</g>
</g>
</svg>