Skip to content

Commit

Permalink
CI: Update update_master.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
tsi authored Mar 17, 2024
1 parent 985f387 commit cec8b4c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/update_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ jobs:
with:
ref: master

- run: git fetch origin edge

- name: Merge edge into master
run: git merge -X ours --no-edit edge

Expand Down

0 comments on commit cec8b4c

Please sign in to comment.