summaryrefslogtreecommitdiff
path: root/.github/workflows/check-pr-conflicts.yml
diff options
context:
space:
mode:
authorrebortg <github@ghlr.de>2024-05-28 12:24:30 +0200
committerrebortg <github@ghlr.de>2024-05-28 12:24:30 +0200
commit96039bd2f44018ae767930e252305bedece57156 (patch)
tree650373a9398085999f8bbb45b09b4896ca489f5f /.github/workflows/check-pr-conflicts.yml
parent0a3febc9524e7f5d3df856bd9cf58aafb3500252 (diff)
parent2be191247b2f10f1bc3ae38f8bcb565ce0af0635 (diff)
downloadvyos-documentation-96039bd2f44018ae767930e252305bedece57156.tar.gz
vyos-documentation-96039bd2f44018ae767930e252305bedece57156.zip
Merge branch 'current' of github.com:vyos/vyos-documentation into current
Diffstat (limited to '.github/workflows/check-pr-conflicts.yml')
-rw-r--r--.github/workflows/check-pr-conflicts.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
new file mode 100644
index 00000000..0c659e6e
--- /dev/null
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -0,0 +1,14 @@
+
+name: "PR Conflicts checker"
+on:
+ pull_request_target:
+ types: [synchronize]
+
+permissions:
+ pull-requests: write
+ contents: read
+
+jobs:
+ check-pr-conflict-call:
+ uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
+ secrets: inherit