Merge pull request #273 from filintod/also-remove-cr-from-file #39
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 main into master | |
| on: | |
| push: | |
| branches: [main] | |
| jobs: | |
| sync: | |
| name: Merge main branch | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v2 | |
| with: {fetch-depth: 0} | |
| - name: merge | |
| run: | | |
| git checkout master | |
| git merge --ff-only main | |
| git push origin master |