diff --git a/configuration/merge-upstream-to-downstream.sh b/configuration/merge-upstream-to-downstream.sh index be32e576968..38cd952371c 100755 --- a/configuration/merge-upstream-to-downstream.sh +++ b/configuration/merge-upstream-to-downstream.sh @@ -38,6 +38,10 @@ # env: MERGE_U2D_LOCAL_DOWNSTREAM_BRANCH # --local-fork-branch NAME default: -- # env: MERGE_U2D_LOCAL_FORK_BRANCH +# -f | --force force PR creation even when upstream contributes +# nothing new (branch consolidation). Bypasses the +# upstream-contribution guard; the empty-range guard +# still applies. env: MERGE_U2D_FORCE # -h | --help show this help and exit # # So, e.g., `export MERGE_U2D_FORK_REMOTE=aksajhfduwafe` in your .bashrc lets you @@ -69,6 +73,7 @@ FORK_BRANCH="${MERGE_U2D_FORK_BRANCH:-main}" LOCAL_UPSTREAM_BRANCH="${MERGE_U2D_LOCAL_UPSTREAM_BRANCH:-}" # resolved after parsing if left empty LOCAL_DOWNSTREAM_BRANCH="${MERGE_U2D_LOCAL_DOWNSTREAM_BRANCH:-}" LOCAL_FORK_BRANCH="${MERGE_U2D_LOCAL_FORK_BRANCH:-}" +FORCE="${MERGE_U2D_FORCE:-}" # non-empty => force PR even without upstream contribution usage() { cat <