diff options
| author | Jason Gross | 2020-01-09 13:55:00 -0500 |
|---|---|---|
| committer | Jason Gross | 2020-01-09 13:55:00 -0500 |
| commit | b9f1d79e188242508dcf29803484b93a4d8e836f (patch) | |
| tree | e53a90f688b1b3bd26218dd32bf83e2232423972 /dev | |
| parent | a9a06ffbd8aa4b5491227b6ef0e63831101b913f (diff) | |
| parent | d8d5631ed89b645e2bce50203a877ef5b5ab4fab (diff) | |
Merge PR #11371: [merge script] Never bypass outdated branch sanity check.
Reviewed-by: JasonGross
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 c0a3eeb11c..a888998ebf 100755 --- a/dev/tools/merge-pr.sh +++ b/dev/tools/merge-pr.sh @@ -137,7 +137,8 @@ if [ "$LOCAL_BRANCH_COMMIT" != "$UPSTREAM_COMMIT" ]; then else error "Local branch is not up-to-date with ${REMOTE}." error "Pull before merging." - ask_confirmation + # This check should never be bypassed. + exit 1 fi fi |