Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

472 auto label merge conflicts #475

Merged
merged 4 commits into from
Nov 17, 2023
Merged

472 auto label merge conflicts #475

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d042ec7
add new file
MarinaProsche Nov 15, 2023
075228c
add string
MarinaProsche Nov 15, 2023
357685b
fix string
MarinaProsche Nov 15, 2023
44422b3
changed structure (on every push)
MarinaProsche Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/label_merge_conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 'Check for merge conflicts'

on:
push:
branches:
- master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нужно заменить правило так, чтобы работало на пуш в любую ветку, но конфликты проверялись относительно мастера


jobs:
triage:
runs-on: ubuntu-20.04

steps:
- uses: mschilde/auto-label-merge-conflicts@master
with:
CONFLICT_LABEL_NAME: "has conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 5
WAIT_MS: 5000
Loading