2 Commits

Author	SHA1	Message	Date
PastaPastaPasta	ac1346278c	ci: adjust handle_potential_conflicts.py such that if mergable_state is dirty (conflicting with base branch), don't check against it. (#4671)	2022-01-20 19:06:37 +03:00
PastaPastaPasta	f3cd4046c9	actions: introduce handle_potential_conflicts.py to only warn on true conflicts. Fail CI when there is a conflict (#4655) ... * introduce handle_potential_conflicts.py to only warn on true conflicts. Fail CI when there is a conflict Signed-off-by: Pasta <pasta@dashboost.org> * remove unneeded input assign Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com> * use dashpay instead of PastaPastaPasta Signed-off-by: Pasta <pasta@dashboost.org> * Update .github/workflows/handle_potential_conflicts.py Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com> * more linter fixes Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>	2022-01-13 17:26:47 +03:00