Add "automatic" to merge label for pull clarity

jordanmccullough · jordanmccullough · commit 7782e025200c · 2014-03-14T09:55:28.000-06:00
diff --git a/slides/assets/diagrams/network.svg b/slides/assets/diagrams/network.svg
@@ -78,10 +78,10 @@
 			<polygon fill="#FFFFFF" points="284.901,125.689 267.102,125.689 267.102,104.363 280.367,104.363 281.542,105.707 
 				284.901,108.897 			"/>
 			<path d="M265.914,126.795v-23.537h15.131l5.044,5.044v18.494L265.914,126.795L265.914,126.795z M284.407,109.982l-5.044-5.044
-				h-11.769v20.175h16.812v-15.131H284.407z M274.32,115.026h-5.044v-6.725h5.044V115.026z M272.639,109.982h-1.681v3.362h1.681
-				V109.982z M272.639,121.751h1.681v1.681h-5.044v-1.681h1.681v-3.362h-1.681v-1.681h3.362v5.043H272.639z M279.364,113.345h1.681
-				v1.681h-5.044v-1.681h1.681v-3.362h-1.681v-1.681h3.362v5.043H279.364z M281.045,123.432h-5.044v-6.725h5.044V123.432z
-				 M279.364,118.388h-1.681v3.362h1.681V118.388z"/>
+				h-11.769v20.175h16.812v-15.131C284.406,109.982,284.407,109.982,284.407,109.982z M274.32,115.026h-5.044v-6.725h5.044V115.026z
+				 M272.639,109.982h-1.681v3.362h1.681V109.982z M272.639,121.751h1.681v1.681h-5.044v-1.681h1.681v-3.362h-1.681v-1.681h3.362
+				v5.043H272.639z M279.364,113.345h1.681v1.681h-5.044v-1.681h1.681v-3.362h-1.681v-1.681h3.362v5.043H279.364z M281.045,123.432
+				h-5.044v-6.725h5.044V123.432z M279.364,118.388h-1.681v3.362h1.681V118.388z"/>
 		</g>
 	</g>
 </g>
@@ -132,11 +132,11 @@
 		<g opacity="0.4">
 			<polygon fill="#FFFFFF" points="454.754,238.887 436.955,238.887 436.955,217.562 450.22,217.562 451.396,218.905 
 				454.754,222.096 			"/>
-			<path d="M435.767,239.993v-23.537h15.131l5.044,5.044v18.494h-20.175V239.993z M454.261,223.181l-5.044-5.044h-11.769v20.175
-				h16.812v-15.131H454.261z M444.173,228.225h-5.044V221.5h5.044V228.225z M442.492,223.181h-1.681v3.362h1.681V223.181z
-				 M442.492,234.949h1.681v1.681h-5.044v-1.681h1.681v-3.362h-1.681v-1.681h3.362v5.043H442.492z M449.217,226.543h1.681v1.681
-				h-5.044v-1.681h1.681v-3.362h-1.681V221.5h3.362v5.043H449.217z M450.898,236.631h-5.044v-6.725h5.044V236.631z M449.217,231.587
-				h-1.681v3.362h1.681V231.587z"/>
+			<path d="M435.767,239.993v-23.537h15.131l5.044,5.044v18.494h-20.175L435.767,239.993L435.767,239.993z M454.261,223.181
+				l-5.044-5.044h-11.769v20.175h16.812v-15.131H454.261z M444.173,228.225h-5.044V221.5h5.044V228.225z M442.492,223.181h-1.681
+				v3.362h1.681V223.181z M442.492,234.949h1.681v1.681h-5.044v-1.681h1.681v-3.362h-1.681v-1.681h3.362v5.043H442.492z
+				 M449.217,226.543h1.681v1.681h-5.044v-1.681h1.681v-3.362h-1.681V221.5h3.362v5.043H449.217z M450.898,236.631h-5.044v-6.725
+				h5.044V236.631z M449.217,231.587h-1.681v3.362h1.681V231.587z"/>
 		</g>
 	</g>
 	<g id="remote">
@@ -171,9 +171,12 @@
 		<path display="none" fill="none" stroke="#ED358C" stroke-miterlimit="10" d="M82.157,126.326c0,0,1.76,0,4.327,0
 			c4.695,0,12.092,0,16.357,0c2.018,0,3.335,0,3.335,0"/>
 	</g>
-	<text transform="matrix(1.0483 0 0 1 105.0415 166.9785)" fill="#231F20" font-family="'ApexNew-Book'" font-size="14">merge</text>
+	
+		<text transform="matrix(1.0483 0 0 1 105.0415 166.9785)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="7" stroke-miterlimit="10" font-family="'ApexNew-Book'" font-size="14">merge (automatic)</text>
+	<text transform="matrix(1.0483 0 0 1 105.0415 166.9785)" fill="#231F20" font-family="'ApexNew-Book'" font-size="14">merge (automatic)</text>
 </g>
-<g id="step-5">
-	<text transform="matrix(1.0483 0 0 1 290.9092 212.645)" fill="#231F20" font-family="'ApexNew-Book'" font-size="14">fetch</text>
+<g id="step-5" display="none">
+	
+		<text transform="matrix(1.0483 0 0 1 290.9092 212.645)" display="inline" fill="#231F20" font-family="'ApexNew-Book'" font-size="14">fetch</text>
 </g>
 </svg>
