aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2023-12-20 16:18:23 +0100
committerGitHub <noreply@github.com>2023-12-20 16:18:23 +0100
commit806be4ec18bebac19c31a8e86350cab4225f60a5 (patch)
treec3e268d09912a88eb139332898fcdb25d3770b95 /.github
parentf490e498ba754f41edc8590b5817be213b0e94d2 (diff)
downloadNorthstarWiki-806be4ec18bebac19c31a8e86350cab4225f60a5.tar.gz
NorthstarWiki-806be4ec18bebac19c31a8e86350cab4225f60a5.zip
Add Action to add label to PR on merge conflict (#265)
Adds a GitHub Action that auto-adds a label to a PR in case there are merge conflicts.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/merge-conflict-auto-label.yml16
1 files changed, 16 insertions, 0 deletions
diff --git a/.github/workflows/merge-conflict-auto-label.yml b/.github/workflows/merge-conflict-auto-label.yml
new file mode 100644
index 0000000..e237726
--- /dev/null
+++ b/.github/workflows/merge-conflict-auto-label.yml
@@ -0,0 +1,16 @@
+name: Merge Conflict Auto Label
+on:
+ push:
+ branches:
+ - main
+
+jobs:
+ triage:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: mschilde/auto-label-merge-conflicts@master
+ with:
+ CONFLICT_LABEL_NAME: "merge conflicts"
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ MAX_RETRIES: 5
+ WAIT_MS: 5000