From f76336a8fecbb626accdbf6f7e6ba9f86293d482 Mon Sep 17 00:00:00 2001
From: Stephane Caron <stephane.caron@ens.fr>
Date: Wed, 23 May 2012 16:12:39 -0700
Subject: figures

---
 figures/git-merge-conflict.svg | 853 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 853 insertions(+)
 create mode 100644 figures/git-merge-conflict.svg

(limited to 'figures/git-merge-conflict.svg')

diff --git a/figures/git-merge-conflict.svg b/figures/git-merge-conflict.svg
new file mode 100644
index 0000000..2c6ce69
--- /dev/null
+++ b/figures/git-merge-conflict.svg
@@ -0,0 +1,853 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="453.5433"
+   height="340.15747"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="git-merge-conflict.svg"
+   version="1.0">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient8361">
+      <stop
+         id="stop8363"
+         offset="0"
+         style="stop-color:#ff7c7c;stop-opacity:0.42424244;" />
+      <stop
+         id="stop8365"
+         offset="1"
+         style="stop-color:#fc0000;stop-opacity:0.54545456;" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path3919"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.3) translate(-2.3,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient6454">
+      <stop
+         style="stop-color:#840000;stop-opacity:1;"
+         offset="0"
+         id="stop6456" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop6458" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Send"
+       style="overflow:visible;">
+      <path
+         id="path3922"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.3) rotate(180) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path3910"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3898"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3892"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3889"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;">
+      <path
+         id="path3904"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.2) rotate(180) translate(6,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient3765">
+      <stop
+         style="stop-color:#7cff8e;stop-opacity:0.42424244;"
+         offset="0"
+         id="stop3767" />
+      <stop
+         style="stop-color:#00ae00;stop-opacity:0.54545456;"
+         offset="1"
+         id="stop3769" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765-5"
+       id="linearGradient3773-9"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.64915963,698.0315)" />
+    <linearGradient
+       id="linearGradient3765-5">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-8" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765-9"
+       id="linearGradient3773-4"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0989933,0,0,1.1054854,-24.018391,689.24045)" />
+    <linearGradient
+       id="linearGradient3765-9">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-103.64657,767.19322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3824"
+       xlink:href="#linearGradient3765-9"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.0989933,0,0,1.1054854,-24.018391,781.36643)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3824-8"
+       xlink:href="#linearGradient3765-9-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-1">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-3" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-9" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-103.64657,852.2326)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3858"
+       xlink:href="#linearGradient3765-9-1"
+       inkscape:collect="always" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3898-0"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5557"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5559"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient3765-9-1-5">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-3-7" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-9-8" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-55.646569,774.27981)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3824-86"
+       xlink:href="#linearGradient3765-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-7">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,767.19322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5577"
+       xlink:href="#linearGradient3765-9-7"
+       inkscape:collect="always" />
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart-3"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3919-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-1"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3898-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient3765-9-7-6">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5-6" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3765-9-1-6">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-3-3" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-9-5" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,745.93338)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5577-4-9"
+       xlink:href="#linearGradient8361"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-7-6-5">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5-6-9" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6-6-6" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send-2"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3904-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-8"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3898-1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient3765-9-7-6-5-3">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5-6-9-7" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6-6-6-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3765-9-1-3">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-3-5" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-9-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3765-9-17">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-8" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-99" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3765-9-7-0">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5-1" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6-67" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8361"
+       id="linearGradient8373"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,745.93338)"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8361-2"
+       id="linearGradient8373-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,745.93338)"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899" />
+    <linearGradient
+       id="linearGradient8361-2">
+      <stop
+         id="stop8363-5"
+         offset="0"
+         style="stop-color:#ff7c7c;stop-opacity:0.42424244;" />
+      <stop
+         id="stop8365-0"
+         offset="1"
+         style="stop-color:#fc0000;stop-opacity:0.54545456;" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-8-7"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3898-1-0"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient8436"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,745.93338)"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient12559"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4653243,0,0,1.1054854,162.95185,682.1538)"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.2048533"
+     inkscape:cx="147.43169"
+     inkscape:cy="165.43721"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     width="12.8cm"
+     height="9.6cm"
+     units="cm"
+     showgrid="true"
+     grid_units="mm"
+     inkscape:object-paths="false"
+     inkscape:grid-points="true"
+     inkscape:grid-bbox="true"
+     inkscape:guide-points="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       orientation="vertical"
+       position="56.476527"
+       id="guide3573" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="11.035643"
+       id="guide3579" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="24.018753"
+       id="guide3886" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="285.62841"
+       id="guide3988" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="303.15561"
+       id="guide4081" />
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="2mm"
+       spacingy="2mm"
+       color="#3f3fff"
+       empcolor="#3f3fff"
+       opacity="0.15"
+       empopacity="0.38"
+       empspacing="5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(4.149475e-6,-698.0315)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.68510181;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
+       d="m 208.88735,798.07634 c 0,16.19576 0,16.19576 0,16.19576"
+       id="path5265"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6472"
+       transform="matrix(0.61712832,0,0,0.61712832,-88.144678,235.0396)">
+      <g
+         id="g12554">
+        <rect
+           style="fill:url(#linearGradient12559);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect2995-5"
+           width="141.73227"
+           height="56.692921"
+           x="289.46457"
+           y="761.81104" />
+        <text
+           xml:space="preserve"
+           style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="310.7244"
+           y="797.24408"
+           id="text5455-4"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan5457-9"
+             x="310.7244"
+             y="797.24408"
+             style="font-size:20px">Commit A</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g6482"
+       transform="matrix(0.61712832,0,0,0.61712832,151.0425,240.48596)">
+      <rect
+         y="846.8504"
+         x="22.866135"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59"
+         style="fill:url(#linearGradient3824);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1"
+         y="882.28345"
+         x="44.125977"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="882.28345"
+           x="44.125977"
+           id="tspan5457-98"
+           sodipodi:role="line">Commit C</tspan></text>
+    </g>
+    <g
+       id="g6487"
+       transform="matrix(0.61712832,0,0,0.61712832,151.0425,240.48596)">
+      <rect
+         y="931.88977"
+         x="22.866135"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-5"
+         style="fill:url(#linearGradient3858);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-5"
+         y="967.32281"
+         x="44.125977"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="967.32281"
+           x="44.125977"
+           id="tspan5457-98-6"
+           sodipodi:role="line">Commit D</tspan></text>
+    </g>
+    <g
+       id="g6467"
+       transform="matrix(0.61712832,0,0,0.61712832,-158.25206,240.48596)">
+      <rect
+         y="846.8504"
+         x="289.46454"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-50"
+         style="fill:url(#linearGradient5577);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-2"
+         y="882.28345"
+         x="310.7244"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="882.28345"
+           x="310.7244"
+           id="tspan5457-98-3"
+           sodipodi:role="line">Commit B</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:25.55520248px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="32.022583"
+       y="730.17078"
+       id="text6442"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6444"
+         x="32.022583"
+         y="730.17078" /></text>
+    <path
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.68847966;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow2Sstart);marker-end:none"
+       d="m 301.14457,836.65205 c 50.69451,0 50.69451,0 50.69451,0"
+       id="path5656-4"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:30.34995079px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="290.53113"
+       y="821.68036"
+       id="text6438-2"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6440-7"
+         x="290.53113"
+         y="821.68036"
+         style="font-size:15.1749754px;fill:#ff0000;font-family:courier;-inkscape-font-specification:courier">git pull</tspan></text>
+    <g
+       id="g6467-4-4"
+       transform="matrix(0.61712832,0,0,0.61712832,-82.140194,423.12571)">
+      <g
+         id="g8367"
+         transform="translate(5.3433662,2.6716831)">
+        <rect
+           style="fill:url(#linearGradient8373);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect2995-59-50-0-9"
+           width="141.7323"
+           height="56.692921"
+           x="289.46454"
+           y="825.59058" />
+        <text
+           xml:space="preserve"
+           style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="361.62772"
+           y="847.66516"
+           id="text5455-1-2-1-1"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan5457-98-3-7-7"
+             x="361.62772"
+             y="847.66516"
+             style="font-size:20px;text-align:center;text-anchor:middle">Unmerged</tspan><tspan
+             id="tspan8359"
+             sodipodi:role="line"
+             x="361.62772"
+             y="872.66516"
+             style="font-size:20px;text-align:center;text-anchor:middle">changes</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g5319"
+       transform="matrix(0.61712832,0,0,0.61712832,87.06815,322.94118)">
+      <g
+         transform="translate(-268.20472,-49.606316)"
+         id="g6462">
+        <path
+           transform="translate(271.74802,733.46459)"
+           d="m 127.55906,237.40157 c 0,21.52606 -17.45032,38.97637 -38.97638,38.97637 -21.52606,0 -38.97638,-17.45031 -38.97638,-38.97637 0,-21.52606 17.45032,-38.97638 38.97638,-38.97638 21.52606,0 38.97638,17.45032 38.97638,38.97638 z"
+           sodipodi:ry="38.976379"
+           sodipodi:rx="38.976379"
+           sodipodi:cy="237.40157"
+           sodipodi:cx="88.58268"
+           id="path4330"
+           style="fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:4.5, 4.5;stroke-dashoffset:0"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.698704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-8)"
+       d="m 64.379075,798.22675 0,95.35767 54.233615,0"
+       id="path4171"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.77585423px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-8)"
+       d="m 209.90396,850.64577 c 0,42.93685 0,42.93685 0,42.93685 l -39.15869,0"
+       id="path5225"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.82438558px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-8)"
+       d="m 145.47711,915.88016 c 0,16.74088 0,16.74088 0,16.74088"
+       id="path5433"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:32.97542572px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="129.32368"
+       y="894.27087"
+       id="text5641"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5643"
+         x="129.32368"
+         y="894.27087"
+         style="font-size:9.89262772px">Merge</tspan></text>
+    <g
+       id="g6467-4-4-8"
+       transform="matrix(0.61712832,0,0,0.61712832,-81.647018,477.37218)">
+      <g
+         id="g8367-1"
+         transform="translate(5.3433662,2.6716831)">
+        <g
+           id="g8431"
+           transform="translate(0,12.963268)">
+          <rect
+             y="825.59058"
+             x="289.46454"
+             height="56.692921"
+             width="141.7323"
+             id="rect2995-59-50-0-9-1"
+             style="fill:url(#linearGradient8436);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text5455-1-2-1-1-7"
+             y="860.62854"
+             x="361.62772"
+             style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-size:20px;text-align:center;text-anchor:middle"
+               y="860.62854"
+               x="361.62772"
+               sodipodi:role="line"
+               id="tspan8359-8">Commit E</tspan></text>
+        </g>
+      </g>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99760801px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-8)"
+       d="m 145.97028,969.40164 c 0,26.04354 0,26.04354 0,26.04354"
+       id="path5433-4"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="151.5"
+       y="983.68896"
+       id="text8438"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan8440"
+         x="151.5"
+         y="983.68896"
+         style="font-size:10px;font-style:italic;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">manual merge</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.70866142;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Mend-8-7)"
+       d="m 178.15145,28.432524 34.47575,0 0,36.399981"
+       id="path12561"
+       inkscape:connector-curvature="0"
+       transform="translate(-4.149475e-6,698.0315)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.7011714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-8-7)"
+       d="m 90.44246,726.29993 -26.786,0 0,35.62508"
+       id="path13363"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
-- 
cgit v1.2.3-70-g09d2