fix(publish): Change instruction text to use 'Rebase and merge' inste…

…ad of squash
spinnaker · Jun 6, 2019 · 14990c6 · 14990c6
1 parent fc95ae4
commit 14990c6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/scripts/modules/publish.sh b/app/scripts/modules/publish.sh
@@ -130,7 +130,7 @@ if [ "$REPLY" == "y" ] ; then
       echo "";
       echo "*****************************************************";
       echo "* Pull request message copied to your clipboard!    *";
-      echo "* Paste it in and use the 'Squash and merge' button *";
+      echo "* Paste it in and use the 'Rebase and merge' button *";
       echo "*****************************************************";
       echo "";
       echo "";