summaryrefslogtreecommitdiff
path: root/.github/workflows/check-pr-conflicts.yml
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-06-27 17:11:47 +0200
committerGitHub <noreply@github.com>2024-06-27 17:11:47 +0200
commit7e8a96e83b562f0eccfb409f219e688511ae336e (patch)
tree98b03148d4140ceb95e16016d2dc3a91408e37b5 /.github/workflows/check-pr-conflicts.yml
parentf7d323f2ba4cd773b3badeddc723ca657195b6cb (diff)
parent54728d5ab67f90980378e1867db878d66d17d0aa (diff)
downloadvyos-build-7e8a96e83b562f0eccfb409f219e688511ae336e.tar.gz
vyos-build-7e8a96e83b562f0eccfb409f219e688511ae336e.zip
Merge pull request #671 from vyos/mergify/bp/sagitta/pr-668
T6508: pr workflows updated for branch and target (backport #668)
Diffstat (limited to '.github/workflows/check-pr-conflicts.yml')
-rw-r--r--.github/workflows/check-pr-conflicts.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index 0c659e6e..8a8e64c2 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -10,5 +10,5 @@ permissions:
jobs:
check-pr-conflict-call:
- uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
+ uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@sagitta
secrets: inherit