example bad commit

scripts/commitlint.sh

@@ -21,10 +21,15 @@ done
 if $failure; then
   # guide developer to resolution
   echo "--------------------------------------------------------"
-  echo "You have commits that have failed linting because they do not follow conventional standards"
-  echo "You must rebase your branch, and amend the commits to follow conventional standards"
+  echo "You have commits that have failed linting because their content does not follow conventional standards"
+  echo "You must rebase, squash, or amend; and implement conventional standards on all commits for this branch"
   echo "Commit standards guide - https://www.conventionalcommits.org/"
-  echo "> git rebase -i $CI_DEFAULT_BRANCH"
+  echo "--------------------------------------------------------"
+  echo "Quick tip - Squash commits for $CI_COMMIT_REF_NAME"
+  echo "> git checkout $CI_COMMIT_REF_NAME"
+  echo "> git reset $(git merge-base $CI_DEFAULT_BRANCH $(git rev-parse --abbrev-ref HEAD))"
+  echo "> git add -A"
+  echo "> git commit -m \"feat: example conventional commit\""
   echo "> git push --force"
   exit 1
 fi
\ No newline at end of file