From 965817cc4fdc6f4fdfc18d5ca6c1ea076b0cb948 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@tweag.io>
Date: Mon, 23 Sep 2024 11:08:52 +0200
Subject: [PATCH] REMOVE try to merge current commit

---
 .github/workflows/publish.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 6943c40c8..b99ae9c1d 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -20,8 +20,8 @@ jobs:
         run: |
           git config user.name github-actions
           git config user.email github-actions@github.com
-        #  - name: Merge master into release
-        #run: git merge --no-edit origin/master
+      - name: Merge master into release
+        run: git merge --no-edit ${{ github.ref_name }}
       - name: Fetch latest release artifact
         id: latest
         env: