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 0a011dc commit e7e9b7a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/update_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- run: git fetch

- run: git checkout master
with:
ref: master
fetch-depth: 0

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

0 comments on commit e7e9b7a

Please sign in to comment.