From 7ba337176e4feab651c8a628e16165238a2714e5 Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Wed, 11 Sep 2024 12:39:06 +0200
Subject: [PATCH] Update merge-up config (#1641)

---
 .github/workflows/merge-up.yml | 2 +-
 .github/workflows/release.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
index cb5a3df02..03f3065bb 100644
--- a/.github/workflows/merge-up.yml
+++ b/.github/workflows/merge-up.yml
@@ -28,5 +28,5 @@ jobs:
         with:
           ref: ${{ github.ref_name }}
           branchNamePattern: 'v<major>.<minor>'
-          fallbackBranch: 'master'
+          devBranchNamePattern: 'v<major>.x'
           enableAutoMerge: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 59f41037e..88e2ccc96 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -116,7 +116,7 @@ jobs:
         with:
           ref: ${{ github.ref_name }}
           branchNamePattern: 'v<major>.<minor>'
-          fallbackBranch: 'master'
+          devBranchNamePattern: 'v<major>.x'
 
       - name: "Manually merge up changes"
         if: ${{ steps.get-next-branch.outputs.hasNextBranch }}