From c980fc5cb564002b1ba6c7392e460e0b89a462bd Mon Sep 17 00:00:00 2001
From: Sebastien Taggart <subs@thetaggarthouse.com>
Date: Thu, 26 Mar 2026 11:34:00 -0400
Subject: [PATCH] Pull before push in deploy targets to prevent
 non-fast-forward errors

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 3df6c8a..2995897 100644
--- a/Makefile
+++ b/Makefile
@@ -90,8 +90,10 @@ endif
 
 # Push the integration branch for preview/testing.
 deploy-preview:
+	git pull --rebase origin $(INTEGRATION_BRANCH)
 	git push origin $(INTEGRATION_BRANCH)
 
 # Publish a tagged release to production.
 deploy-prod:
+	git pull --rebase origin $(PRODUCTION_BRANCH) --tags
 	git push origin $(PRODUCTION_BRANCH) --tags