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 e7e9b7a commit 7f6bb25
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/update_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fetch-depth: 0

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

- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
Expand Down

0 comments on commit 7f6bb25

Please sign in to comment.