From 3fc9732f81fd281dda8c870c913c62454693ca51 Mon Sep 17 00:00:00 2001
From: ttakuya50 <ttakuya500@gmail.com>
Date: Fri, 8 May 2020 15:46:05 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 40e5952..7eb416f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,12 +38,12 @@ jobs:
           git push origin "${{ env.TAGNAME }}"
       - name: develop merge
         run: |
-          git fetch -q origin develop
           git checkout ${{ github.head_ref }}
           git checkout develop
-          git merge --no-ff ${{ github.head_ref }}
+          git merge --no-ff -m "Merge tag ${{ env.TAGNAME }} into develop" ${{ github.head_ref }}
           git push origin develop
 #          git fetch -q origin develop
+#          git fetch -q origin develop
 #          git fetch -q origin ${{ github.head_ref }}
 #          git push origin HEAD:develop
 #          git merge --allow-unrelated-histories --no-ff -m "Merge tag ${{ env.TAGNAME }} into develop" "${{ env.TAGNAME }}"