From 1d3d4e86e80e9fd774c92addacbe24fb505c95b1 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Fri, 21 Feb 2020 12:56:34 +0100
Subject: [merge-script] Improve warning in case of batch merging.

---
 dev/tools/merge-pr.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dev')

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}."
-- 
cgit v1.2.3