modified colors.sh script

colors.sh

 for i in {"red","pink","purple","deep purple","indigo","blue","light blue","cyan","teal","green","light green","lime","yellow","amber","orange","deep orange","brown","grey","blue grey"}
 do
+  git pull --rebase origin colors
+  git pull --rebase 
   echo "Setting color to: $i, ${i/ /_}, color_${i/ /_}"
   #git checkout -b color_${i/ /_}
   git checkout color_${i/ /_}
   sed -ri "s/(primary: ').*'/\1$i'/" mkdocs.yml
   #git cherry-pick bd8e358 
-  #git commit -am "Setting color to: $i"
-  git pull --rebase origin colors
-  git pull --rebase 
+  git commit -am "Setting color to: $i"
   git push --set-upstream origin color_${i/ /_}
   git checkout colors
 done

mkdocs.yml

@@ -190,8 +190,13 @@ pages:
 extra:
   logo: img/logo2.png
   palette:
-    primary: 'purple'
+<<<<<<< HEAD
+    primary: 'blue grey'
     accent: 'light blue'
+=======
+    primary: 'blue grey'
+    accent: 'red'
+>>>>>>> Setting color to: red
   font:
     text: 'Roboto'
     code: 'Roboto Mono'