From 268b1d80d18e161d511ea835f1b6c0179064db98 Mon Sep 17 00:00:00 2001
From: Parker TenBroeck <51721964+ParkerTenBroeck@users.noreply.github.com>
Date: Wed, 7 Jan 2026 16:40:29 -0500
Subject: [PATCH] deploy script..

---
 web/deploy.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/deploy.sh b/web/deploy.sh
index 8c39ba9..67fa27f 100755
--- a/web/deploy.sh
+++ b/web/deploy.sh
@@ -58,7 +58,7 @@ if [[ "$LOCAL_MAIN" != "$REMOTE_MAIN" && "$LOCAL_MAIN" == "$BASE_MAIN" ]]; then
 fi
 
 echo "✅ '$MAIN_BRANCH' is up-to-date (or ahead/diverged). Pulling latest..."
-git pull --ff-only "$REMOTE" "$PAGES_BRANCH"
+git pull --ff-only "$REMOTE" "$MAIN_BRANCH"
 
 echo "🏗️  Running build: deno task build"
 deno task build
@@ -73,8 +73,8 @@ git show-ref --verify --quiet "refs/heads/$PAGES_BRANCH" || {
 echo "🌿 Switching to '$PAGES_BRANCH'..."
 git switch -q "$PAGES_BRANCH"
 
-echo "🔀 Fast-forward merging '$MAIN_BRANCH' into '$PAGES_BRANCH'..."
-git merge --ff-only "$MAIN_BRANCH"
+echo "🔀 Merging '$MAIN_BRANCH' into '$PAGES_BRANCH'..."
+git merge "$MAIN_BRANCH"
 
 # Copy dist -> docs (replace docs contents)
 if [[ ! -d "dist" ]]; then