diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2024-02-10 21:01:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 21:01:31 +0100 |
| commit | 855802ca4506733829e5dcaca7e0bd3f7295a9aa (patch) | |
| tree | d64325b5e72a7ffaaf7f5f0011e994da813847d2 /.github/workflows/merge-conflict-auto-label.yml | |
| parent | ec70d375d1d764ea09edc14dec5d0e4dfa00ad78 (diff) | |
| parent | 9c27c1c65145dc644c97f19558b63f70b98f3abf (diff) | |
| download | NorthstarWiki-855802ca4506733829e5dcaca7e0bd3f7295a9aa.tar.gz NorthstarWiki-855802ca4506733829e5dcaca7e0bd3f7295a9aa.zip | |
Merge branch 'main' into docs/rcondocs/rcon
Diffstat (limited to '.github/workflows/merge-conflict-auto-label.yml')
| -rw-r--r-- | .github/workflows/merge-conflict-auto-label.yml | 16 |
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 |