From df9df2590d5a216f5ce98b35469c5eacfb12d438 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Feb 2026 13:59:42 +0000
Subject: [PATCH 1/2] Initial plan


From 26e7708ae581e2249196a9e9835663746168a89a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Feb 2026 14:08:38 +0000
Subject: [PATCH 2/2] Add automatic merge flow from main to
 feature/net11-scouting

- Added merge flow configuration in .config/service-branch-merge.json
- Excludes files managed independently by the scouting branch:
  - global.json (SDK version)
  - eng/Version.Details.xml (dependency SHAs)
  - eng/Version.Details.props (version properties)
  - eng/Versions.props (package versions)
  - eng/common/** (arcade infrastructure)
  - eng/TargetFrameworks.props (TFM configuration)
- Uses -QuietComments switch for clean merge commits
- Workflow already triggers on main pushes (no YAML changes needed)

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>
---
 .config/service-branch-merge.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.config/service-branch-merge.json b/.config/service-branch-merge.json
index 3f573ae3cc1..409525cc16c 100644
--- a/.config/service-branch-merge.json
+++ b/.config/service-branch-merge.json
@@ -16,6 +16,18 @@
         "release/dev18.0": {
             "MergeToBranch": "main",
             "ExtraSwitches": "-QuietComments"
+        },
+        "main": {
+            "MergeToBranch": "feature/net11-scouting",
+            "ExtraSwitches": "-QuietComments",
+            "ResetToTargetPaths": [
+                "global.json",
+                "eng/Version.Details.xml",
+                "eng/Version.Details.props",
+                "eng/Versions.props",
+                "eng/common/**",
+                "eng/TargetFrameworks.props"
+            ]
         }
     }
 }