Skip to content

Commit

Permalink
Merge pull request #155 from jammsen/develop
Browse files Browse the repository at this point in the history
Added new merge flow
  • Loading branch information
jammsen authored Jan 31, 2024
2 parents 7c49715 + fcca4ae commit 3f555b9
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/auto-merge-master-to-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Pull request to master
on:
pull_request:
branches: [master]
types: [closed]
jobs:
merge-master-back-to-dev:
if: github.event.pull_request.merged == true
timeout-minutes: 1
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set Git config
run: |
git config --local user.email "[email protected]"
git config --local user.name "Github Actions"
- name: Merge master back to dev
run: |
git fetch --unshallow
git checkout develop
git pull
git merge --no-ff master -m "Auto-merge master back to dev"
git push

0 comments on commit 3f555b9

Please sign in to comment.