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 }}"