diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2021-08-13 15:58:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 15:58:31 +0200 |
| commit | 222cd43222c68ba5376b681d2a5fd7b90da138b0 (patch) | |
| tree | c2f3d0ff54e35cd131db50cecf16d22532721067 /scripts/squash_typos.py | |
| parent | ce172d8d4a94c8ffbe313c240d4bd37acb6fd090 (diff) | |
| download | rneovim-222cd43222c68ba5376b681d2a5fd7b90da138b0.tar.gz rneovim-222cd43222c68ba5376b681d2a5fd7b90da138b0.tar.bz2 rneovim-222cd43222c68ba5376b681d2a5fd7b90da138b0.zip | |
ci: comment from bot is more helpful in case of conflict (#15359)
Also change PR title to follow conventional commits convention.
Diffstat (limited to 'scripts/squash_typos.py')
| -rw-r--r-- | scripts/squash_typos.py | 8 |
1 files changed, 5 insertions, 3 deletions
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)", ] ) |