From 05a1d205281200312fe2d08b812e1c35ef7fe92b Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 5 Mar 2025 14:14:03 -0800
Subject: [PATCH 1/4] Auto merge code flow PRs

---
 .github/policies/resourceManagement.yml | 27 +++++++++++++++++++++++--
 .github/workflows/branch-snap.yml       |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index 4009668659..4af4a49301 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -10,16 +10,39 @@ configuration:
 
     eventResponderTasks:
 
+    - description: Auto-approve/merge automated merge PRs
+      triggerOnOwnActions: false
+      if:
+      - payloadType: Pull_Request
+      - isPullRequest
+      - isActivitySender:
+        user: github-actions
+        issueAuthor: False
+      - or:
+        - titleContains:
+          pattern: "[automated] Merge branch"
+          isRegex: False
+        - titleContains:
+          pattern: "[automated] Update main version"
+          isRegex: False
+      - isAction:
+        action: Opened
+      then:
+      - approvePullRequest:
+        comment: Auto-approve
+      - enableAutoMerge:
+        mergeMethod: merge
+
     - description: Add "untriaged" label to issues when opened
       triggerOnOwnActions: false
       if:
       - payloadType: Issues
       - or:
         - isAction:
-            action: Opened
+          action: Opened
       then:
       - addLabel:
-          label: untriaged
+        label: untriaged
 
 onFailure: 
 onSuccess:
\ No newline at end of file
diff --git a/.github/workflows/branch-snap.yml b/.github/workflows/branch-snap.yml
index a14845a405..0ff08cbe13 100644
--- a/.github/workflows/branch-snap.yml
+++ b/.github/workflows/branch-snap.yml
@@ -31,5 +31,5 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update main version
-          title: 'Update main version'
+          title: '[automated] Update main version'
           branch: merge/update-main-version

From eab641ffe9b17fc205c292715d0563ac2b39e437 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 5 Mar 2025 14:22:30 -0800
Subject: [PATCH 2/4] Fix indentation

---
 .github/policies/resourceManagement.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index 4af4a49301..1754e7f7b5 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -16,22 +16,22 @@ configuration:
       - payloadType: Pull_Request
       - isPullRequest
       - isActivitySender:
-        user: github-actions
-        issueAuthor: False
+          user: github-actions
+          issueAuthor: False
       - or:
         - titleContains:
-          pattern: "[automated] Merge branch"
-          isRegex: False
+            pattern: "[automated] Merge branch"
+            isRegex: False
         - titleContains:
-          pattern: "[automated] Update main version"
-          isRegex: False
+            pattern: "[automated] Update main version"
+            isRegex: False
       - isAction:
         action: Opened
       then:
       - approvePullRequest:
-        comment: Auto-approve
+          comment: Auto-approve
       - enableAutoMerge:
-        mergeMethod: merge
+          mergeMethod: merge
 
     - description: Add "untriaged" label to issues when opened
       triggerOnOwnActions: false
@@ -39,10 +39,10 @@ configuration:
       - payloadType: Issues
       - or:
         - isAction:
-          action: Opened
+            action: Opened
       then:
       - addLabel:
-        label: untriaged
+          label: untriaged
 
 onFailure: 
 onSuccess:
\ No newline at end of file

From ca088c25c20fa4f54c129dc526235f64502812dc Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 5 Mar 2025 14:23:12 -0800
Subject: [PATCH 3/4] Fix more indentation

---
 .github/policies/resourceManagement.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index 1754e7f7b5..e50c4a543e 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -26,7 +26,7 @@ configuration:
             pattern: "[automated] Update main version"
             isRegex: False
       - isAction:
-        action: Opened
+          action: Opened
       then:
       - approvePullRequest:
           comment: Auto-approve

From a64a6a1aa2504e09cf3742d09dca45fcb9e00015 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Wed, 5 Mar 2025 14:47:57 -0800
Subject: [PATCH 4/4] Fix bot name

Co-authored-by: Ankita Khera <40616383+akhera99@users.noreply.github.com>
---
 .github/policies/resourceManagement.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index e50c4a543e..a2980caf27 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -16,7 +16,7 @@ configuration:
       - payloadType: Pull_Request
       - isPullRequest
       - isActivitySender:
-          user: github-actions
+          user: github-actions[bot]
           issueAuthor: False
       - or:
         - titleContains: