2016-12-18 13:59:44 +00:00
|
|
|
<!--
|
|
|
|
|
2016-12-31 18:19:50 +00:00
|
|
|
# Test the scenario of a branch merging back to master.
|
2016-12-18 13:59:44 +00:00
|
|
|
|
|
|
|
git branch test-merging
|
2016-12-31 18:19:50 +00:00
|
|
|
|
|
|
|
git commit -m "Commit on master"
|
2016-12-18 13:59:44 +00:00
|
|
|
|
|
|
|
git checkout test-merging
|
|
|
|
git commit -m 'A sample commit'
|
|
|
|
|
|
|
|
git checkout master
|
|
|
|
git commit -m "Another master commit"
|
|
|
|
|
|
|
|
git merge test-merging
|
|
|
|
|
|
|
|
-->
|
|
|
|
|
2019-08-06 11:51:57 +00:00
|
|
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-10 -10 204 270">
|
2016-12-18 13:59:44 +00:00
|
|
|
<style type="text/css"><![CDATA[
|
|
|
|
.branch {
|
2016-12-28 21:13:49 +00:00
|
|
|
fill: none;
|
|
|
|
stroke-width: 10;
|
2016-12-31 18:19:50 +00:00
|
|
|
stroke-linecap: round;
|
2016-12-18 13:59:44 +00:00
|
|
|
}
|
|
|
|
.commit {
|
2016-12-28 21:13:49 +00:00
|
|
|
fill: #fff;
|
|
|
|
stroke-width: 5;
|
2016-12-18 13:59:44 +00:00
|
|
|
}
|
2016-12-28 21:13:49 +00:00
|
|
|
.label-tag {
|
|
|
|
fill: #333;
|
|
|
|
}
|
|
|
|
.label-rect {
|
|
|
|
stroke: none;
|
|
|
|
}
|
|
|
|
.label-text {
|
|
|
|
font-family: Inconsolata, Consolas, monospace;
|
2016-12-31 18:19:50 +00:00
|
|
|
font-size: 14px;
|
2016-12-28 21:13:49 +00:00
|
|
|
fill: #fff;
|
|
|
|
stroke: none;
|
|
|
|
}
|
|
|
|
.branch-master {stroke: #002b36; fill: #002b36}
|
|
|
|
.branch-test-merging {stroke: #268bd2; fill: #268bd2}
|
2016-12-18 13:59:44 +00:00
|
|
|
]]></style>
|
|
|
|
<g class="merge">
|
|
|
|
<g class="branch-test-merging">
|
2016-12-31 18:19:50 +00:00
|
|
|
<path class="branch" d="M50,0 C50,0 50,0 50,100" />
|
|
|
|
<path class="branch" d="M0,200 C50,200 50,200 50,100" />
|
2016-12-18 13:59:44 +00:00
|
|
|
</g>
|
2017-01-12 22:31:50 +00:00
|
|
|
<g class="branch-master">
|
|
|
|
<path class="branch" d="M0,0 C0,0 0,0 0,50" />
|
2019-08-06 11:51:57 +00:00
|
|
|
<path class="branch" d="M0,200 L0,250" />
|
2017-01-12 22:31:50 +00:00
|
|
|
</g>
|
2016-12-18 13:59:44 +00:00
|
|
|
</g>
|
|
|
|
<g class="branch-test-merging">
|
2016-12-31 18:19:50 +00:00
|
|
|
<path class="branch" d="M50,100 L50,100" />
|
|
|
|
<circle class="commit" cx="50" cy="100" r="7.5" />
|
|
|
|
<g class="label-branch" transform="translate(100,100)">
|
2017-01-12 22:31:50 +00:00
|
|
|
<rect x="0" y="-14" width="94" height="24" rx="3" class="label-rect" />
|
2018-01-13 14:14:55 +00:00
|
|
|
<text x="5" y="2" textLength="84" class="label-text">test-merging</text>
|
2016-12-28 21:13:49 +00:00
|
|
|
</g>
|
2016-12-18 13:59:44 +00:00
|
|
|
</g>
|
|
|
|
<g class="branch-master">
|
2017-01-12 22:31:50 +00:00
|
|
|
<path class="branch" d="M0,50 L0,200" />
|
2016-12-18 13:59:44 +00:00
|
|
|
<circle class="commit" cx="0" cy="50" r="7.5" />
|
2016-12-31 18:19:50 +00:00
|
|
|
<circle class="commit" cx="0" cy="150" r="7.5" />
|
2016-12-18 13:59:44 +00:00
|
|
|
<circle class="commit" cx="0" cy="200" r="7.5" />
|
2016-12-31 18:19:50 +00:00
|
|
|
<g class="label-branch" transform="translate(100,200)">
|
2017-01-12 22:31:50 +00:00
|
|
|
<rect x="0" y="-14" width="52" height="24" rx="3" class="label-rect" />
|
2018-01-13 14:14:55 +00:00
|
|
|
<text x="5" y="2" textLength="42" class="label-text">master</text>
|
2016-12-28 21:13:49 +00:00
|
|
|
</g>
|
2016-12-18 13:59:44 +00:00
|
|
|
</g>
|
|
|
|
</svg>
|