Skip to content

Commit

Permalink
remove merge back to dev step, that should wait or be separate
Browse files Browse the repository at this point in the history
  • Loading branch information
mahiki committed Jul 22, 2024
1 parent 70694b9 commit 74ef9e7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:
git branch --list
git log --graph -n10 --pretty=format:'%h %as %cn %x09%s %d'
- name: Merge back to dev
run: |
git checkout dev
git merge --no-ff main
git push origin dev
# - name: Merge back to dev
# run: |
# git checkout dev
# git merge --no-ff main
# git push origin dev

- name: Merge the latest release commit
run: |
Expand Down

0 comments on commit 74ef9e7

Please sign in to comment.