From cce76b00a9aeb813f590c5729ef06bfa16e68459 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 20 Feb 2026 08:54:26 +0100
Subject: [PATCH] [workflows] Add an arcade workflow to flow 'main' into
 'net11.0'.

Automated >> Manual
---
 .github/workflows/inter-branch-merge-flow.yml | 33 +++++++++++++++++++
 github-merge-flow.jsonc                       | 13 ++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 .github/workflows/inter-branch-merge-flow.yml
 create mode 100644 github-merge-flow.jsonc

diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml
new file mode 100644
index 000000000000..35a5b4584b4f
--- /dev/null
+++ b/.github/workflows/inter-branch-merge-flow.yml
@@ -0,0 +1,33 @@
+# Inter-branch merge workflow
+# Uses the shared dotnet/arcade merge flow infrastructure to automatically
+# create PRs when changes are pushed to source branches.
+#
+# Configuration is in /github-merge-flow.jsonc at the repository root.
+# Currently configured merge paths:
+#   main → net11.0
+#
+# Key features (from arcade):
+#   - ResetToTargetPaths: auto-resets version files (global.json, eng/*, etc.)
+#     to target branch versions, avoiding common merge conflicts
+#   - QuietComments: reduces GitHub notification noise
+#   - Skips PRs when only Maestro bot commits exist
+#   - Detailed PR body with merge/conflict resolution instructions
+
+name: Inter-branch merge workflow
+
+on:
+  push:
+    branches:
+      - main
+
+  # Run every day at 3:00 AM UTC
+  schedule:
+    - cron: '0 3 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Merge:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
diff --git a/github-merge-flow.jsonc b/github-merge-flow.jsonc
new file mode 100644
index 000000000000..e9afd1ea6090
--- /dev/null
+++ b/github-merge-flow.jsonc
@@ -0,0 +1,13 @@
+// Configuration for the inter-branch merge flow workflow.
+// This file is read from the 'main' branch by the arcade-based merge flow.
+// See: https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml
+{
+    "merge-flow-configurations": {
+        // Merge main into net11.0
+        "main": {
+            "MergeToBranch": "net11.0",
+            "ExtraSwitches": "-QuietComments",
+            "ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
+        }
+    }
+}