Add figure illustrating

gllmflndn · gllmflndn · commit 9a4357596f98 · 2023-03-27T19:15:12.000+01:00
diff --git a/docs/assets/figures/git_pull_rebase.svg b/docs/assets/figures/git_pull_rebase.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Lager_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 800 485" style="enable-background:new 0 0 800 485;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#999999;}
+	.st1{fill:#B3E3FF;stroke:#404040;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#404040;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st3{fill:#FFFFFF;stroke:#404040;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st4{fill:#B18BE8;stroke:#404040;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st5{fill:#404040;}
+</style>
+<path class="st0" d="M344.4,17.2V8.9l-3.6,8.3h-1.3l-3.6-8.3v8.3h-1.5V6.6h2l3.7,8.7l3.8-8.7h2v10.6H344.4z M350.8,13.1l1.9-0.3
+	c0.4-0.1,0.6-0.3,0.6-0.5c0-0.7-0.5-1.3-1.6-1.3c-1,0-1.5,0.6-1.6,1.5l-1.4-0.3c0.2-1.4,1.4-2.3,3-2.3c2.2,0,3,1.2,3,2.6V16
+	c0,0.6,0.1,1,0.1,1.2h-1.4c0-0.2-0.1-0.5-0.1-1c-0.3,0.5-1,1.2-2.3,1.2c-1.5,0-2.4-1-2.4-2.2C348.7,14,349.6,13.3,350.8,13.1
+	L350.8,13.1z M353.4,14.1v-0.3l-2.2,0.3c-0.6,0.1-1,0.4-1,1.1c0,0.5,0.4,1,1.2,1C352.4,16.3,353.4,15.7,353.4,14.1z M361.7,11.4
+	h-0.6c-1.2,0-2,0.6-2,2.2v3.6h-1.4V10h1.4v1.3c0.5-1.1,1.4-1.4,2.2-1.4h0.5v1.5L361.7,11.4z M364.4,20.2l1.8-3.8l-3.1-6.4h1.6l2.2,5
+	l2.2-5h1.5L366,20.2H364.4z M373.2,6.5c0.6,0,1.1,0.5,1.1,1.3c0,1.9-1.2,2.6-2.1,2.7V9.8c0.7-0.2,1.1-0.8,1.2-1.5
+	c0,0-0.2,0.1-0.3,0.1c-0.5,0-0.9-0.4-0.9-1C372.2,6.9,372.6,6.5,373.2,6.5L373.2,6.5z M376.7,14.9c0.1,0.8,0.7,1.3,1.7,1.3
+	c0.8,0,1.2-0.4,1.2-1c0-0.5-0.3-0.8-0.9-0.9l-1.2-0.3c-1.1-0.2-1.8-1-1.8-2c0-1.2,1.2-2.3,2.6-2.3c2,0,2.6,1.3,2.7,1.9l-1.2,0.5
+	c-0.1-0.4-0.4-1.2-1.5-1.2c-0.7,0-1.2,0.5-1.2,1c0,0.4,0.3,0.8,0.8,0.9l1.2,0.3c1.3,0.3,2,1.1,2,2.1s-0.9,2.2-2.6,2.2
+	c-2,0-2.8-1.3-2.9-2.1L376.7,14.9L376.7,14.9z M391.3,12.9h-1.6v4.3h-1.5V6.6h4c2,0,3.3,1.4,3.3,3.2c0,1.5-1,2.7-2.6,3l2.5,4.5h-1.7
+	L391.3,12.9L391.3,12.9z M392,11.6c1.2,0,2-0.7,2-1.8S393.2,8,392,8h-2.2v3.6H392z M404.1,15.2c-0.4,1.3-1.6,2.3-3.2,2.3
+	c-1.9,0-3.6-1.4-3.6-3.9c0-2.3,1.6-3.8,3.4-3.8c2.2,0,3.5,1.5,3.5,3.8V14h-5.4c0,1.3,1,2.2,2.2,2.2s1.8-0.6,2-1.5L404.1,15.2z
+	 M402.7,12.9c0-1-0.7-1.8-2-1.8c-1.2,0-1.9,0.9-2,1.8H402.7z M406.7,20.1V10h1.4v1.1c0.4-0.7,1.2-1.3,2.4-1.3c2.2,0,3.3,1.7,3.3,3.8
+	s-1.2,3.8-3.4,3.8c-1.1,0-1.9-0.5-2.3-1.2V20h-1.4V20.1z M410.2,11.1c-1.3,0-2.1,1.1-2.1,2.5c0,1.5,0.9,2.5,2.1,2.5
+	c1.3,0,2.1-1.1,2.1-2.5C412.4,12.2,411.6,11.1,410.2,11.1z M423.1,13.6c0,2.2-1.5,3.8-3.7,3.8s-3.7-1.6-3.7-3.8s1.5-3.8,3.7-3.8
+	S423.1,11.4,423.1,13.6z M421.7,13.6c0-1.7-1.1-2.6-2.2-2.6s-2.2,0.9-2.2,2.6s1.1,2.6,2.2,2.6S421.7,15.3,421.7,13.6z M426.3,14.9
+	c0.1,0.8,0.7,1.3,1.7,1.3c0.8,0,1.2-0.4,1.2-1c0-0.5-0.3-0.8-0.9-0.9l-1.2-0.3c-1.1-0.2-1.8-1-1.8-2c0-1.2,1.2-2.3,2.6-2.3
+	c2,0,2.6,1.3,2.7,1.9l-1.2,0.5c-0.1-0.4-0.4-1.2-1.5-1.2c-0.7,0-1.2,0.5-1.2,1c0,0.4,0.3,0.8,0.8,0.9l1.2,0.3c1.3,0.3,2,1.1,2,2.1
+	s-0.9,2.2-2.6,2.2c-2,0-2.8-1.3-2.9-2.1L426.3,14.9L426.3,14.9z M433.9,6.3c0.6,0,1,0.4,1,1s-0.4,1-1,1s-1-0.5-1-1
+	C432.9,6.7,433.3,6.3,433.9,6.3z M433.2,17.2V10h1.4v7.2H433.2z M439.6,10h1.6v1.3h-1.6V15c0,0.7,0.3,1,1,1c0.2,0,0.4,0,0.6-0.1v1.2
+	c-0.1,0-0.5,0.1-1,0.1c-1.2,0-2-0.8-2-2.1v-4h-1.4V10h0.4c0.8,0,1.1-0.5,1.1-1.1V7.7h1.3V10z M450.5,13.6c0,2.2-1.5,3.8-3.7,3.8
+	s-3.7-1.6-3.7-3.8s1.5-3.8,3.7-3.8S450.5,11.4,450.5,13.6z M449.1,13.6c0-1.7-1.1-2.6-2.2-2.6s-2.2,0.9-2.2,2.6s1,2.6,2.2,2.6
+	S449.1,15.3,449.1,13.6z M457.1,11.4h-0.6c-1.2,0-2,0.6-2,2.2v3.6h-1.4V10h1.4v1.3c0.5-1.1,1.4-1.4,2.2-1.4h0.5v1.5L457.1,11.4z
+	 M459.8,20.2l1.8-3.8l-3.1-6.4h1.6l2.2,5l2.2-5h1.5l-4.7,10.2H459.8z"/>
+<path class="st1" d="M695.7,399.2h96.2v50h-96.2V399.2z"/>
+<path class="st2" d="M743.8,355.7v23.5 M733,364.4l10.8-10.8l10.9,10.8 M653.4,454.7l14.4,5.2l-5.2,14.4"/>
+<path class="st3" d="M421,399.2h96.2v50H421V399.2z"/>
+<path class="st2" d="M469.1,355.7v23.5 M458.3,364.4l10.8-10.8l10.9,10.8 M489.9,311.1h-83h41.2 M293.2,270.1c0-22.6-18.4-41-41-41
+	H50.1 M293.2,270.1c0,22.6,18.4,41,41,41h30.7 M50.1,229.1h440"/>
+<circle class="st3" cx="195.6" cy="229.1" r="21"/>
+<circle class="st3" cx="112.4" cy="229.1" r="21"/>
+<circle class="st3" cx="469.1" cy="311.1" r="21"/>
+<circle class="st3" cx="385.9" cy="311.1" r="21"/>
+<path class="st2" d="M681.6,311.1h41.2 M567.9,270.1c0-22.6-18.4-41-41-41H324.8 M567.9,270.1c0,22.6,18.4,41,41,41h30.7"/>
+<circle class="st4" cx="469.1" cy="229.1" r="21"/>
+<circle class="st1" cx="743.8" cy="311.1" r="21"/>
+<circle class="st1" cx="660.6" cy="311.1" r="21"/>
+<circle class="st4" cx="385.9" cy="229.1" r="21"/>
+<circle class="st3" cx="29.1" cy="229.1" r="21"/>
+<path class="st2" d="M469.1,184.1v-23.5 M480,175.4l-10.9,10.8l-10.8-10.8"/>
+<path class="st4" d="M401.1,89.7h136v50h-136L401.1,89.7z"/>
+<path class="st5" d="M431.5,109.8c2.7,0,5.3,2,5.3,5.5c0,3.6-2.7,5.5-5.3,5.5c-2.7,0-5.3-2-5.3-5.5
+	C426.1,111.8,428.8,109.8,431.5,109.8z M431.5,119.6c2,0,3.8-1.4,3.8-4.2c0-2.8-1.9-4.2-3.8-4.2c-2,0-3.8,1.4-3.8,4.2
+	C427.6,118.1,429.5,119.6,431.5,119.6z M443.4,114.9h-0.6c-1.2,0-2,0.6-2,2.2v3.6h-1.4v-7.2h1.4v1.3c0.5-1.1,1.4-1.4,2.2-1.4h0.5
+	v1.5H443.4z M446.4,109.7c0.6,0,1,0.5,1,1c0,0.6-0.4,1-1,1s-1-0.5-1-1S445.8,109.7,446.4,109.7z M445.7,120.7v-7.2h1.4v7.2H445.7z
+	 M451.1,120.8c0.1,1,0.9,1.8,2,1.8c1.5,0,2.2-0.8,2.2-2.3v-1c-0.3,0.7-1.1,1.2-2.2,1.2c-1.9,0-3.3-1.5-3.3-3.5
+	c0-1.9,1.3-3.5,3.3-3.5c1.1,0,1.9,0.4,2.2,1.1v-1h1.4v6.7c0,1.8-0.9,3.6-3.6,3.6c-1.8,0-3.1-1.1-3.3-2.7
+	C449.8,121.2,451.1,120.8,451.1,120.8z M455.3,116.9c0-1.4-0.8-2.3-2.1-2.3c-1.2,0-2.1,0.9-2.1,2.3s0.8,2.3,2.1,2.3
+	S455.3,118.2,455.3,116.9z M460.3,109.7c0.6,0,1,0.5,1,1c0,0.6-0.4,1-1,1s-1-0.5-1-1S459.8,109.7,460.3,109.7z M459.6,120.7v-7.2
+	h1.4v7.2H459.6z M465.6,120.7h-1.4v-7.2h1.4v1c0.5-0.9,1.4-1.2,2.2-1.2c1.7,0,2.6,1.2,2.6,2.9v4.6H469v-4.3c0-1-0.4-1.8-1.7-1.8
+	c-1.1,0-1.7,0.9-1.7,2L465.6,120.7L465.6,120.7z M473.5,120.7h-1.4l5.1-10.6h1.4L473.5,120.7z"/>
+<path class="st2" d="M539.5,462.2c18.3,10.1,39.3,15.8,61.6,15.8c22.8,0,44.2-6,62.8-16.5"/>
+<g>
+	<path d="M453.3,430.4v-10h2l2.4,7.1c0.2,0.7,0.4,1.2,0.5,1.5c0.1-0.4,0.3-0.9,0.5-1.6l2.4-7h1.8v10h-1.3V422l-2.9,8.4h-1.2
+		l-2.9-8.5v8.5H453.3z"/>
+	<path d="M470.3,429.5c-0.5,0.4-0.9,0.7-1.3,0.8c-0.4,0.2-0.9,0.2-1.4,0.2c-0.8,0-1.4-0.2-1.8-0.6s-0.6-0.9-0.6-1.5
+		c0-0.4,0.1-0.7,0.2-1c0.2-0.3,0.4-0.5,0.6-0.7c0.3-0.2,0.6-0.3,0.9-0.4c0.2-0.1,0.6-0.1,1.1-0.2c1-0.1,1.7-0.3,2.2-0.4
+		c0-0.2,0-0.3,0-0.3c0-0.5-0.1-0.9-0.3-1.1c-0.3-0.3-0.8-0.4-1.4-0.4s-1,0.1-1.3,0.3c-0.3,0.2-0.5,0.6-0.6,1.1l-1.2-0.2
+		c0.1-0.5,0.3-0.9,0.5-1.2c0.3-0.3,0.6-0.6,1.1-0.7c0.5-0.2,1-0.3,1.6-0.3s1.1,0.1,1.5,0.2s0.7,0.3,0.9,0.6c0.2,0.2,0.3,0.5,0.4,0.8
+		c0,0.2,0.1,0.6,0.1,1.1v1.6c0,1.1,0,1.9,0.1,2.2c0.1,0.3,0.2,0.6,0.3,0.9h-1.3C470.4,430.2,470.3,429.9,470.3,429.5z M470.2,426.8
+		c-0.4,0.2-1.1,0.3-2,0.5c-0.5,0.1-0.9,0.2-1.1,0.2s-0.4,0.2-0.5,0.4c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.3,0.1,0.6,0.4,0.8
+		c0.2,0.2,0.6,0.3,1.1,0.3s0.9-0.1,1.3-0.3c0.4-0.2,0.6-0.5,0.8-0.9c0.1-0.3,0.2-0.7,0.2-1.2L470.2,426.8L470.2,426.8z"/>
+	<path d="M474,421.8v-1.4h1.2v1.4H474z M474,430.4v-7.3h1.2v7.3H474z"/>
+	<path d="M477.8,430.4v-7.3h1.1v1c0.5-0.8,1.3-1.2,2.3-1.2c0.4,0,0.8,0.1,1.2,0.2c0.4,0.2,0.6,0.4,0.8,0.6s0.3,0.6,0.4,0.9
+		c0,0.2,0.1,0.6,0.1,1.2v4.5h-1.2v-4.4c0-0.5,0-0.9-0.1-1.1s-0.3-0.4-0.5-0.6c-0.2-0.1-0.5-0.2-0.9-0.2c-0.5,0-1,0.2-1.4,0.5
+		s-0.6,1-0.6,1.9v4H477.8z"/>
+</g>
+<g>
+	<path d="M730.2,430.4v-10h2l2.4,7.1c0.2,0.7,0.4,1.2,0.5,1.5c0.1-0.4,0.3-0.9,0.5-1.6l2.4-7h1.8v10h-1.3V422l-2.9,8.4h-1.2
+		l-2.9-8.5v8.5H730.2z"/>
+	<path d="M747.2,429.5c-0.5,0.4-0.9,0.7-1.3,0.8c-0.4,0.2-0.9,0.2-1.4,0.2c-0.8,0-1.4-0.2-1.8-0.6c-0.4-0.4-0.6-0.9-0.6-1.5
+		c0-0.4,0.1-0.7,0.2-1c0.2-0.3,0.4-0.5,0.6-0.7c0.3-0.2,0.6-0.3,0.9-0.4c0.2-0.1,0.6-0.1,1.1-0.2c1-0.1,1.7-0.3,2.2-0.4
+		c0-0.2,0-0.3,0-0.3c0-0.5-0.1-0.9-0.3-1.1c-0.3-0.3-0.8-0.4-1.4-0.4c-0.6,0-1,0.1-1.3,0.3c-0.3,0.2-0.5,0.6-0.6,1.1l-1.2-0.2
+		c0.1-0.5,0.3-0.9,0.5-1.2c0.3-0.3,0.6-0.6,1.1-0.7c0.5-0.2,1-0.3,1.6-0.3s1.1,0.1,1.5,0.2s0.7,0.3,0.9,0.6c0.2,0.2,0.3,0.5,0.4,0.8
+		c0,0.2,0.1,0.6,0.1,1.1v1.6c0,1.1,0,1.9,0.1,2.2c0.1,0.3,0.2,0.6,0.3,0.9h-1.3C747.3,430.2,747.2,429.9,747.2,429.5z M747.1,426.8
+		c-0.4,0.2-1.1,0.3-2,0.5c-0.5,0.1-0.9,0.2-1.1,0.2c-0.2,0-0.4,0.2-0.5,0.4c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.3,0.1,0.6,0.4,0.8
+		c0.2,0.2,0.6,0.3,1.1,0.3s0.9-0.1,1.3-0.3c0.4-0.2,0.6-0.5,0.8-0.9c0.1-0.3,0.2-0.7,0.2-1.2V426.8z"/>
+	<path d="M750.9,421.8v-1.4h1.2v1.4H750.9z M750.9,430.4v-7.3h1.2v7.3H750.9z"/>
+	<path d="M754.7,430.4v-7.3h1.1v1c0.5-0.8,1.3-1.2,2.3-1.2c0.4,0,0.8,0.1,1.2,0.2c0.4,0.2,0.6,0.4,0.8,0.6s0.3,0.6,0.4,0.9
+		c0,0.2,0.1,0.6,0.1,1.2v4.5h-1.2v-4.4c0-0.5,0-0.9-0.1-1.1s-0.3-0.4-0.5-0.6c-0.2-0.1-0.5-0.2-0.9-0.2c-0.5,0-1,0.2-1.4,0.5
+		s-0.6,1-0.6,1.9v4H754.7z"/>
+</g>
+<g>
+	<path class="st5" d="M479.9,120.7v-10h2l2.4,7.1c0.2,0.7,0.4,1.2,0.5,1.5c0.1-0.4,0.3-0.9,0.5-1.6l2.4-7h1.8v10h-1.3v-8.4l-2.9,8.4
+		h-1.2l-2.9-8.5v8.5H479.9z"/>
+	<path class="st5" d="M496.9,119.8c-0.5,0.4-0.9,0.7-1.3,0.8c-0.4,0.2-0.9,0.2-1.4,0.2c-0.8,0-1.4-0.2-1.8-0.6s-0.6-0.9-0.6-1.5
+		c0-0.4,0.1-0.7,0.2-1c0.2-0.3,0.4-0.5,0.6-0.7c0.3-0.2,0.6-0.3,0.9-0.4c0.2-0.1,0.6-0.1,1.1-0.2c1-0.1,1.7-0.3,2.2-0.4
+		c0-0.2,0-0.3,0-0.3c0-0.5-0.1-0.9-0.3-1.1c-0.3-0.3-0.8-0.4-1.4-0.4s-1,0.1-1.3,0.3c-0.3,0.2-0.5,0.6-0.6,1.1l-1.2-0.2
+		c0.1-0.5,0.3-0.9,0.5-1.2c0.3-0.3,0.6-0.6,1.1-0.7c0.5-0.2,1-0.3,1.6-0.3s1.1,0.1,1.5,0.2s0.7,0.3,0.9,0.6c0.2,0.2,0.3,0.5,0.4,0.8
+		c0,0.2,0.1,0.6,0.1,1.1v1.6c0,1.1,0,1.9,0.1,2.2c0.1,0.3,0.2,0.6,0.3,0.9h-1.3C497,120.5,496.9,120.2,496.9,119.8z M496.8,117.1
+		c-0.4,0.2-1.1,0.3-2,0.5c-0.5,0.1-0.9,0.2-1.1,0.2s-0.4,0.2-0.5,0.4c-0.1,0.2-0.2,0.4-0.2,0.6c0,0.3,0.1,0.6,0.4,0.8
+		c0.2,0.2,0.6,0.3,1.1,0.3s0.9-0.1,1.3-0.3c0.4-0.2,0.6-0.5,0.8-0.9c0.1-0.3,0.2-0.7,0.2-1.2L496.8,117.1L496.8,117.1z"/>
+	<path class="st5" d="M500.6,112.1v-1.4h1.2v1.4H500.6z M500.6,120.7v-7.3h1.2v7.3H500.6z"/>
+	<path class="st5" d="M504.4,120.7v-7.3h1.1v1c0.5-0.8,1.3-1.2,2.3-1.2c0.4,0,0.8,0.1,1.2,0.2c0.4,0.2,0.6,0.4,0.8,0.6
+		s0.3,0.6,0.4,0.9c0,0.2,0.1,0.6,0.1,1.2v4.5h-1.2v-4.4c0-0.5,0-0.9-0.1-1.1s-0.3-0.4-0.5-0.6c-0.2-0.1-0.5-0.2-0.9-0.2
+		c-0.5,0-1,0.2-1.4,0.5s-0.6,1-0.6,1.9v4H504.4z"/>
+</g>
+</svg>
diff --git a/docs/development/git.md b/docs/development/git.md
@@ -153,6 +153,11 @@ Longer description that might contain bullet points:
 
 We are using a [Centralised Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows#centralized-workflow). This is also called [Trunk Based Development](https://trunkbaseddevelopment.com/) (see this [article](https://medium.com/@mattia.battiston/why-i-love-trunk-based-development-641fcf0b94a0) for a discussion). Popular other workflows include [GitHub Flow](https://githubflow.github.io/) and [Gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).
 
+<figure markdown>
+  ![Git clone](../assets/figures/git_pull_rebase.svg)
+  <figcaption>`git pull` is used to incorporate upstream changes into the repository. The `--rebase` option tells Git to move all of the local commits to the tip of the `main` branch after synchronising it with the changes from the central repository. From [Atlassian documentation](https://www.atlassian.com/git/tutorials/comparing-workflows#centralized-workflow)</figcaption>
+</figure>
+
 ## Pull Requests
 
 Recommendation for pull request reviewers: When merging, we generally like `squash+merge`. Unless it is the rare case of a PR with carefully staged individual commits that you want in the history separately, in which case `merge` is acceptable, but usually prefer `squash+merge`.
