Commit Graph

2 Commits (b398ba7497321b2deeef22373c027da6df6e2770)

Author SHA1 Message Date
Frank Elsinga 359e961aa7
Fixed flipflopping between having `needs:resolve-merge-conflict` and not having `needs:resolve-merge-conflict`
7 months ago
Gauvino 533af0f56c
feat: Add merge conflict labeler workflow (#4694)
7 months ago