grawkit/tests/04-merge.svg

<!--

# Test the scenario of a branch merging back to master.

git branch test-merging

git commit -m "Commit on master"

git checkout test-merging
git commit -m 'A sample commit'

git checkout master
git commit -m "Another master commit"

git merge test-merging

-->

<svg xmlns="http://www.w3.org/2000/svg" viewBox="-10 -10 204 270">
<style type="text/css"><![CDATA[
.branch {
	fill: none;
	stroke-width: 10;
	stroke-linecap: round;
}
.commit {
	fill: #fff;
	stroke-width: 5;
}
.label-tag {
	fill: #333;
}
.label-rect {
	stroke: none;
}
.label-text {
	font-family: Inconsolata, Consolas, monospace;
	font-size: 14px;
	fill: #fff;
	stroke: none;
}
.branch-master {stroke: #002b36; fill: #002b36}
.branch-test-merging {stroke: #268bd2; fill: #268bd2}
]]></style>
<g class="merge">
	<g class="branch-test-merging">
		<path class="branch" d="M50,0 C50,0 50,0 50,100" />
		<path class="branch" d="M0,200 C50,200 50,200 50,100" />
	</g>
	<g class="branch-master">
		<path class="branch" d="M0,0 C0,0 0,0 0,50" />
		<path class="branch" d="M0,200 L0,250" />
	</g>
</g>
<g class="branch-test-merging">
	<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)">
		<rect x="0" y="-14" width="94" height="24" rx="3" class="label-rect" />
		<text x="5" y="2" textLength="84" class="label-text">test-merging</text>
	</g>
</g>
<g class="branch-master">
	<path class="branch" d="M0,50 L0,200" />
	<circle class="commit" cx="0" cy="50" r="7.5" />
	<circle class="commit" cx="0" cy="150" r="7.5" />
	<circle class="commit" cx="0" cy="200" r="7.5" />
	<g class="label-branch" transform="translate(100,200)">
		<rect x="0" y="-14" width="52" height="24" rx="3" class="label-rect" />
		<text x="5" y="2" textLength="42" class="label-text">master</text>
	</g>
</g>
</svg>