From 845051c4c2c8c32ba403b2e6912478d6373fa556 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Sat, 12 Aug 2023 17:48:30 -0700
Subject: [PATCH] chore: rebase before commit bundled web app

---
 .github/workflows/javascript-format-build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/javascript-format-build.yml b/.github/workflows/javascript-format-build.yml
index 22fa2437b..dfe9367fe 100644
--- a/.github/workflows/javascript-format-build.yml
+++ b/.github/workflows/javascript-format-build.yml
@@ -155,6 +155,11 @@ jobs:
       - name: Bundle web app (next.js build)
         run: build/web/bundleWeb.sh
 
+      - name: Rebase
+        if: ${{ github.ref == 'refs/heads/develop' }}
+        run: |
+          git pull --rebase --autostash
+
         # Only commit built web project files on develop.
       - name: Commit changes
         if: ${{ github.ref == 'refs/heads/develop' }}