2 Commits

Author	SHA1	Message	Date
Frank Elsinga	359e961aa7	Fixed flipflopping between having `needs:resolve-merge-conflict` and not having `needs:resolve-merge-conflict`	2024-05-23 20:16:37 +02:00
Gauvino	533af0f56c	feat: Add merge conflict labeler workflow (#4694) ... Co-authored-by: Frank Elsinga <frank@elsinga.de>	2024-05-20 00:16:42 +02:00