From 2632f47e071df4977688fad32c99280a18fdabd8 Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Wed, 18 Feb 2026 14:52:33 +0100 Subject: [PATCH] Fix silent comit for the rebasebot. This requires a rebasebot to support new flag: --conflict-policy strict Signed-off-by: Michal Pryc --- run-oadp-rebase.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/run-oadp-rebase.sh b/run-oadp-rebase.sh index 98a8d23..8e04f99 100755 --- a/run-oadp-rebase.sh +++ b/run-oadp-rebase.sh @@ -313,7 +313,8 @@ run_local_rebase() { --github-app-id \"$GITHUB_APP_ID\" \ --github-app-key \"$SECRETS_DIR/oadp-rebasebot-app-key\" \ --github-cloner-id \"$GITHUB_CLONER_ID\" \ - --github-cloner-key \"$SECRETS_DIR/oadp-rebasebot-cloner-key\"" + --github-cloner-key \"$SECRETS_DIR/oadp-rebasebot-cloner-key\" \ + --conflict-policy strict" [ -n "$REPO_WORKING_DIR" ] && CMD="$CMD --working-dir \"$REPO_WORKING_DIR\"" [ -n "${HOOK_SCRIPTS:-}" ] && CMD="$CMD $HOOK_SCRIPTS" @@ -405,7 +406,8 @@ run_container_rebase() { --github-app-id \"$GITHUB_APP_ID\" \ --github-app-key /secrets/oadp-rebasebot-app-key \ --github-cloner-id \"$GITHUB_CLONER_ID\" \ - --github-cloner-key /secrets/oadp-rebasebot-cloner-key" + --github-cloner-key /secrets/oadp-rebasebot-cloner-key \ + --conflict-policy strict" [ -n "$REBASEBOT_WORKING_DIR" ] && CMD="$CMD --working-dir \"$REBASEBOT_WORKING_DIR\"" [ -n "${HOOK_SCRIPTS:-}" ] && CMD="$CMD $HOOK_SCRIPTS"