From bd5f928cabda3d5394d4fc7200944195fee724fe Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Tue, 14 Jul 2026 23:29:49 +0000
Subject: [PATCH] fix(actions): merge base branch when resuming dated pricing
 update branch

---
 .github/workflows/auto_update_price_and_context_window.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/auto_update_price_and_context_window.yml b/.github/workflows/auto_update_price_and_context_window.yml
index 5e2820356a0..412e7f08f8e 100644
--- a/.github/workflows/auto_update_price_and_context_window.yml
+++ b/.github/workflows/auto_update_price_and_context_window.yml
@@ -33,6 +33,7 @@ jobs:
           git fetch origin "${BASE_BRANCH}" "${BRANCH_NAME}" || true
           if git show-ref --verify --quiet "refs/remotes/origin/${BRANCH_NAME}"; then
             git checkout -B "${BRANCH_NAME}" "origin/${BRANCH_NAME}"
+            git merge --no-edit "origin/${BASE_BRANCH}"
           else
             git checkout -b "${BRANCH_NAME}" "origin/${BASE_BRANCH}"
           fi