prototype/APPEALS-57839 #738
Workflow file for this run
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: PRs to master | |
| on: | |
| pull_request: | |
| branches: [master] | |
| types: [closed] | |
| jobs: | |
| merge-master-back-to-dev: | |
| if: github.event.pull_request.merged == true | |
| timeout-minutes: 2 | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v2 | |
| - name: Set Git config | |
| run: | | |
| git config --local user.email "jeremy.shields@va.gov" | |
| git config --local user.name "Jeremy Shields" | |
| - name: Merge master back to dev | |
| run: | | |
| git fetch --unshallow | |
| git checkout development | |
| git pull | |
| git merge -Xtheirs --no-ff master -m "Auto-merge master back to dev" | |
| git push |