From 627c539937696ad439dcf3bbeb1bfc9bd22c99ec Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:42:59 -0700 Subject: [PATCH] Update auto-merge.yml --- .github/policies/auto-merge.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/policies/auto-merge.yml b/.github/policies/auto-merge.yml index 76c4db6968e27..e8801d9bfcb5c 100644 --- a/.github/policies/auto-merge.yml +++ b/.github/policies/auto-merge.yml @@ -16,9 +16,8 @@ configuration: label: ':octocat: auto-merge' - targetsBranch: branch: main - - or: - - isActivitySender: - user: dotnet-policy-service[bot] + - isActivitySender: + user: dotnet-policy-service[bot] then: - enableAutoMerge: mergeMethod: Squash