From 5fad3b515fe17ca94f33b49f540956ea0e2ae178 Mon Sep 17 00:00:00 2001
From: ce5rpy <169016246+ce5rpy@users.noreply.github.com>
Date: Sun, 21 Jun 2026 01:49:37 -0400
Subject: [PATCH] fix(ci): force-with-lease when syncing develop after release
 (#13)

Squash merges to master diverge from develop; a plain fast-forward push
to develop is rejected after every release.
---
 .github/workflows/release.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 257c09d..8ee4cc4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -72,5 +72,8 @@ jobs:
       - name: Sync develop from master
         if: steps.semantic.outputs.released == 'true'
         run: |
-          git fetch origin master
-          git push origin origin/master:refs/heads/develop
+          set -euo pipefail
+          git fetch origin master develop
+          # Squash merges to master diverge from develop; reset develop to released master.
+          git push origin origin/master:refs/heads/develop \
+            --force-with-lease=refs/heads/develop:refs/remotes/origin/develop