From c980fc5cb564002b1ba6c7392e460e0b89a462bd Mon Sep 17 00:00:00 2001 From: Sebastien Taggart Date: Thu, 26 Mar 2026 11:34:00 -0400 Subject: [PATCH 1/2] Pull before push in deploy targets to prevent non-fast-forward errors Co-Authored-By: Claude Opus 4.6 (1M context) --- 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 From 9038abc752f170a8594a02318517f7f94a0cbb93 Mon Sep 17 00:00:00 2001 From: Sebastien Taggart Date: Thu, 26 Mar 2026 11:36:08 -0400 Subject: [PATCH 2/2] Bump version to 0.3.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0d91a54..9e11b32 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.0 +0.3.1