Skip to content

Commit

Permalink
fix: add a specific error message for the commit queue (#645)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alicia Lopez committed Jul 31, 2022
1 parent 5bda17d commit 623605e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions lib/landing_session.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,13 @@ export default class LandingSession extends Session {

if (!forceLand) {
cli.info(
'Use --fixupAll option, squash the PR manually or land the PR from ' +
'the command line.'
'GITHUB_ACTION' in process.env

? 'Add `commit-queue-squash` label to land the PR as one commit, ' +
'or `commit-queue-rebase` to land as separate commits.'

: 'Use --fixupAll option, squash the PR manually or land the PR ' +
'from the command line.'
);
process.exit(1);
}
Expand Down

0 comments on commit 623605e

Please sign in to comment.