From 29cf01e24c2552a70f7484d9ed1ad3cf11d81010 Mon Sep 17 00:00:00 2001
From: mateo-berri <277851410+mateo-berri@users.noreply.github.com>
Date: Tue, 21 Jul 2026 21:48:49 +0000
Subject: [PATCH] fix(actions): merge the base branch when resuming an existing
 dated 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