diff options
| author | Emilio Jesus Gallego Arias | 2020-02-22 23:01:16 -0500 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2020-02-22 23:01:16 -0500 |
| commit | 8e3ff397ed403f3da90300ec3196810167ce61a0 (patch) | |
| tree | a22d67c7762227e80614365502df5f0599340a84 /dev | |
| parent | fe86fb5561f2bbde86236d8c91e973df4393049f (diff) | |
| parent | 1d3d4e86e80e9fd774c92addacbe24fb505c95b1 (diff) | |
Merge PR #11651: [merge-script] Improve warning in case of batch merging.
Reviewed-by: ejgallego
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/tools/merge-pr.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh index a888998ebf..d8d835d9b8 100755 --- a/dev/tools/merge-pr.sh +++ b/dev/tools/merge-pr.sh @@ -132,7 +132,8 @@ if [ "$LOCAL_BRANCH_COMMIT" != "$UPSTREAM_COMMIT" ]; then if git merge-base --is-ancestor -- "$UPSTREAM_COMMIT" "$LOCAL_BRANCH_COMMIT"; then warning "Your branch is ahead of ${REMOTE}." - warning "You should see this warning only if you've just merged another PR and did not push yet." + warning "On master, GitHub's branch protection rule prevents merging several PRs at once." + warning "You should run [git push ${REMOTE}] between each call to the merge script." ask_confirmation else error "Local branch is not up-to-date with ${REMOTE}." |