From 03758a01e379209e5fc45d2a48aa7b88250c951e Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Sun, 13 Jul 2025 12:02:09 +1000
Subject: [PATCH] Add git rebase before push to handle updated PR branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .github/workflows/changelog-v3.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/changelog-v3.yml b/.github/workflows/changelog-v3.yml
index 838b8897a..1bed8de8b 100644
--- a/.github/workflows/changelog-v3.yml
+++ b/.github/workflows/changelog-v3.yml
@@ -123,6 +123,9 @@ jobs:
           
           # Only push if running on the main wailsapp repository
           if [ "${{ github.repository }}" = "wailsapp/wails" ]; then
+            # Pull latest changes and rebase our commit
+            git fetch origin $BRANCH_NAME
+            git rebase origin/$BRANCH_NAME
             git push origin HEAD:$BRANCH_NAME
           else
             echo "⚠️ Running on fork (${{ github.repository }}). Skipping push - manual fix required."