remove REQUIRED from some default values + fix typos
#2
Workflow file for this run
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Merge master into develop | |
| on: | |
| pull_request: | |
| branches: | |
| - master | |
| types: | |
| - closed | |
| jobs: | |
| merge-master-back-to-develop: | |
| if: github.event.pull_request.merged == true | |
| timeout-minutes: 5 | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v4 | |
| - name: Merge master back to develop | |
| run: | | |
| git config --local user.email "[email protected]" | |
| git config --local user.name "Github Actions" | |
| git fetch --unshallow | |
| git checkout develop | |
| git status | |
| git merge --no-ff --allow-unrelated-histories origin/master -m "Auto-merge master back to develop" | |
| git push |