All figures are OK now

7 files changed, 385 insertions, 0 deletions

diff --git a/figures/git-merge-conflict.pdf b/figures/git-merge-conflict.pdf
new file mode 100644
index 0000000..9afaa89
--- /dev/null
+++ b/figures/git-merge-conflict.pdf
diff --git a/figures/git-merge-ok.pdf b/figures/git-merge-ok.pdf
new file mode 100644
index 0000000..2de8c2b
--- /dev/null
+++ b/figures/git-merge-ok.pdf
diff --git a/figures/git-pull-2.pdf b/figures/git-pull-2.pdf
new file mode 100644
index 0000000..67e5edb
--- /dev/null
+++ b/figures/git-pull-2.pdf
diff --git a/figures/git-pull.pdf b/figures/git-pull.pdf
new file mode 100644
index 0000000..f4770ff
--- /dev/null
+++ b/figures/git-pull.pdf
diff --git a/figures/git-push.pdf b/figures/git-push.pdf
new file mode 100644
index 0000000..2c544f8
--- /dev/null
+++ b/figures/git-push.pdf
diff --git a/figures/overview.pdf b/figures/overview.pdf
new file mode 100644
index 0000000..2c37a60
--- /dev/null
+++ b/figures/overview.pdf
diff --git a/figures/overview.svg b/figures/overview.svg
new file mode 100644
index 0000000..0301731
--- /dev/null
+++ b/figures/overview.svg
@@ -0,0 +1,385 @@
+<?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="425.81476"
+   height="107.29842"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="overview.svg"
+   version="1.0">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4832">
+      <stop
+         style="stop-color:#c4c9e1;stop-opacity:1;"
+         offset="0"
+         id="stop4834" />
+      <stop
+         style="stop-color:#c4c9e1;stop-opacity:0;"
+         offset="1"
+         id="stop4836" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4824">
+      <stop
+         style="stop-color:#c4c9e1;stop-opacity:1;"
+         offset="0"
+         id="stop4826" />
+      <stop
+         style="stop-color:#c4c9e1;stop-opacity:0;"
+         offset="1"
+         id="stop4828" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4816">
+      <stop
+         style="stop-color:#c4c9e1;stop-opacity:1;"
+         offset="0"
+         id="stop4818" />
+      <stop
+         style="stop-color:#c4c9e1;stop-opacity:0;"
+         offset="1"
+         id="stop4820" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend"
+       style="overflow:visible">
+      <path
+         id="path3831"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path3837"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-6"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3831-8"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-1"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3831-2"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-1-6"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3831-2-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4816"
+       id="linearGradient4822"
+       x1="63.470566"
+       y1="846.85034"
+       x2="163.30109"
+       y2="846.85034"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4824"
+       id="linearGradient4830"
+       x1="205.20284"
+       y1="846.85034"
+       x2="305.03336"
+       y2="846.85034"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4832"
+       id="linearGradient4838"
+       x1="346.93512"
+       y1="846.85034"
+       x2="446.76559"
+       y2="846.85034"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="211.34198"
+     inkscape:cy="-2.5660255"
+     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="false"
+     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:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <sodipodi:guide
+       orientation="vertical"
+       position="42.612266,-141.23267"
+       id="guide3573" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="-13.864261,-130.19703"
+       id="guide3579" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="-13.864261,-117.21392"
+       id="guide3886" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="-13.864261,144.39574"
+       id="guide3988" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="-13.864261,161.92294"
+       id="guide4081" />
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="2mm"
+       spacingy="2mm"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5"
+       units="mm"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-13.864257,-789.65787)">
+    <g
+       id="g4738"
+       transform="translate(-49.60631,-9.5195619e-6)">
+      <rect
+         y="825.59052"
+         x="63.779522"
+         height="42.519714"
+         width="99.212601"
+         id="rect2995"
+         style="fill:url(#linearGradient4822);fill-opacity:1;stroke:#000000;stroke-width:0.61791003;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3033"
+         y="853.93701"
+         x="113.38583"
+         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="853.93701"
+           x="113.38583"
+           id="tspan3035"
+           sodipodi:role="line">Files</tspan></text>
+    </g>
+    <g
+       id="g4743"
+       transform="translate(-28.346444,3.0370438e-5)">
+      <rect
+         y="825.59052"
+         x="205.5118"
+         height="42.519714"
+         width="99.212608"
+         id="rect2995-4"
+         style="fill:url(#linearGradient4830);fill-opacity:1;stroke:#000000;stroke-width:0.61791009;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3037"
+         y="853.93701"
+         x="242.03149"
+         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="853.93701"
+           x="242.03149"
+           id="tspan3039"
+           sodipodi:role="line">git</tspan></text>
+    </g>
+    <g
+       id="g4748"
+       transform="translate(-7.086603,3.0370438e-5)">
+      <rect
+         y="825.59052"
+         x="347.24408"
+         height="42.519714"
+         width="99.21257"
+         id="rect2995-4-5"
+         style="fill:url(#linearGradient4838);fill-opacity:1;stroke:#000000;stroke-width:0.61790997;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3041"
+         y="853.93701"
+         x="366.50394"
+         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="853.93701"
+           x="366.50394"
+           id="tspan3043"
+           sodipodi:role="line">Server</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.22378051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
+       d="m 113.38583,839.76377 c 31.88976,-21.25984 63.77952,0 63.77952,0"
+       id="path3049"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.22378063;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
+       d="m 276.37795,839.76377 c 31.88976,-21.25984 63.77953,0 63.77953,0"
+       id="path3049-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.22474492px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-1)"
+       d="m 177.16535,853.937 c -31.88977,21.25984 -63.77953,0 -63.77953,0"
+       id="path4497"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.22474492px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-1)"
+       d="m 340.15748,853.937 c -31.88976,21.25984 -63.77953,0 -63.77953,0"
+       id="path4497-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="120.47243"
+       y="823.59045"
+       id="text4719"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4721"
+         x="120.47243"
+         y="823.59045"
+         style="font-size:16px;font-style:italic;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">commit</tspan></text>
+    <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="308.96063"
+       y="823.59045"
+       id="text4719-3"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4721-9"
+         x="308.96063"
+         y="823.59045"
+         style="font-size:16px;font-style:italic;text-align:center;text-anchor:middle;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">push</tspan></text>
+    <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="309.811"
+       y="877.19678"
+       id="text4719-3-6"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4721-9-2"
+         x="309.811"
+         y="877.19678"
+         style="font-size:16px;font-style:italic;text-align:center;text-anchor:middle;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">pull</tspan></text>
+    <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="144.81888"
+       y="877.19678"
+       id="text4719-3-6-2"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4721-9-2-0"
+         x="144.81888"
+         y="877.19678"
+         style="font-size:16px;font-style:italic;text-align:center;text-anchor:middle;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">merge</tspan></text>
+    <path
+       style="opacity:0.41999996;fill:none;stroke:#000000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.99685049, 0.99921262;stroke-dashoffset:0"
+       d="m 308.72441,790.15748 0,106.29921"
+       id="path4840"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>