From f19a030cc4de590667b604a75c90e56c4c36734a Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Thu, 28 Jul 2016 15:23:57 -0400 Subject: [PATCH] Adding set -e on merge script I had some cases where I had pending changes on my local copy and the script silent failed. This will make sure people using this script would notice any failure during a merge --- scripts/merge-PR.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh index d7225e6d38..dc42761a14 100755 --- a/scripts/merge-PR.sh +++ b/scripts/merge-PR.sh @@ -16,9 +16,11 @@ # specific language governing permissions and limitations # under the License. +# Setting the script to fail if anything goes wrong +set -e # Use this to simplify the rebasing of PRs. PRs will be rebased during the merge on this process. -# use: ./rebase-PR textual description +# use: ./merge-PR textual description # this script assumes the following remote entries on your config #