Skip to content

Commit

Permalink
Update pull.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
axelburks authored May 4, 2024
1 parent c156a52 commit 22e447d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/pull.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '1'
rules:
- base: master
upstream: diygod:master
- base:
upstream:
# default value if this file does not exist is `hardreset`, effectively overwriting any downstream changes!
# previously it was the misconfigured PR route test workflow that rescued downstream changes from being overwritten
mergeMethod: merge
Expand Down

0 comments on commit 22e447d

Please sign in to comment.