diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 0daf8a090eef..477e2ab3f810 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -42,10 +42,12 @@ jobs:
         run: yarn tslint
       - name: Check for circular dependencies
         run: yarn -s ts-circular-deps:check
-      - name: Check commit message
-        run: yarn ng-dev commit-message validate-range ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}
       - name: Check code format
         run: yarn ng-dev format changed --check ${{ github.event.pull_request.base.sha }}
+      # Commit message check is last intentionally, because the caretaker can fix it
+      # during merge, while other lint failures have to be resolved by the PR author.
+      - name: Check commit message
+        run: yarn ng-dev commit-message validate-range ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}
 
   api_golden_checks:
     runs-on: ubuntu-latest