diff --git a/prow/config.yaml b/prow/config.yaml index 5adb12f7bc8..063696fa777 100644 --- a/prow/config.yaml +++ b/prow/config.yaml @@ -399,6 +399,9 @@ tide: istio-private: squash target_url: https://prow.istio.io/tide blocker_label: tide/merge-blocker + squash_label: tide/merge-method-squash + rebase_label: tide/merge-method-rebase + merge_label: tide/merge-method-merge context_options: from-branch-protection: true skip-unknown-contexts: true