We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 12e29d0 commit afe18a2Copy full SHA for afe18a2
.github/workflows/release.yml
@@ -95,15 +95,13 @@ jobs:
95
prerelease: false
96
97
- name: Checkout develop branch
98
- if: ${{ github.ref }} == 'master'
99
uses: actions/checkout@v2
100
with:
101
ref: 'develop'
102
fetch-depth: 0
103
104
- name: Merge release branch into develop
105
id: mergeIntoDevelop
106
107
run: |
108
git merge -m 'Merge master branch into develop after a release' origin/master
109
git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \
0 commit comments