Skip to content

Commit

Permalink
Make cherry pick error message more useful (#33037)
Browse files Browse the repository at this point in the history
  • Loading branch information
estherkim committed Mar 5, 2021
1 parent 00fff2b commit 5c8cee4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion build-system/compile/internal-version.js
Expand Up @@ -88,7 +88,9 @@ function getVersion() {
const numberOfCherryPicks = gitCherryMaster().length;
if (numberOfCherryPicks > 999) {
throw new Error(
`This branch has ${numberOfCherryPicks} cherry-picks, which is more than 999, the maximum allowed number of cherry-picks!`
`This branch has ${numberOfCherryPicks} cherry-picks, which is more ` +
'than 999, the maximum allowed number of cherry-picks! Please make ' +
'sure your local master branch is up to date.'
);
}

Expand Down

0 comments on commit 5c8cee4

Please sign in to comment.