From 222cd43222c68ba5376b681d2a5fd7b90da138b0 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Fri, 13 Aug 2021 15:58:31 +0200
Subject: ci: comment from bot is more helpful in case of conflict (#15359)

Also change PR title to follow conventional commits convention.
---
 scripts/squash_typos.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/squash_typos.py b/scripts/squash_typos.py
index 5fb0690877..305680f079 100644
--- a/scripts/squash_typos.py
+++ b/scripts/squash_typos.py
@@ -70,8 +70,10 @@ def rebase_onto_pr():
                 "comment",
                 os.environ["PR_NUMBER"],
                 "--body",
-                f"Your edit conflicts with an already scheduled fix ({squash_url}). \
-                        Please wait for an adult to come and help you.",
+                f"Your edit conflicts with an already scheduled fix \
+                ({squash_url}). Please check that batch PR whether your fix is \
+                already included; if not, then please wait until the batch PR \
+                is merged and then rebase your PR on top of master.",
             ]
         )
 
@@ -185,7 +187,7 @@ def main():
             "--head",
             squash_branch,
             "--title",
-            "Dedicated PR for all typo fixes.",
+            "chore: typo fixes (automated)",
         ]
     )
 
-- 
cgit