rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(workflows): git

Browse Source
This commit is contained in:
Mo
2022-06-20 12:04:32 -05:00
parent f527d5f265
commit 31556891ef
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/promote.develop.yml vendored
View File

@@ -29,6 +29,7 @@ jobs:
- name: Merge Develop into Main - name: Merge Develop into Main
run: | run: |
git config pull.rebase false
git checkout main git checkout main
git pull origin develop git pull origin develop
git push origin main git push origin main

1
.github/workflows/publish.yml vendored
View File

@@ -63,6 +63,7 @@ jobs:
- name: Merge release into develop - name: Merge release into develop
if: ${{ github.ref == 'refs/heads/main' }} if: ${{ github.ref == 'refs/heads/main' }}
run: | run: |
git config pull.rebase false
git checkout develop git checkout develop
git pull origin main git pull origin main
git push origin develop git push origin develop