Merge #3
This file contains 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 | |
| on: | |
| push: | |
| branches: [main] | |
| workflow_dispatch: | |
| jobs: | |
| merge-main-to-develop: | |
| name: Merge main back to develop | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v2 | |
| - name: Merge command | |
| run: | | |
| git fetch | |
| git checkout main | |
| git pull | |
| git checkout develop | |
| git pull | |
| git merge main -m "build: merge main back to develop" --allow-unrelated-histories | |
| git push |