Commit Graph

2 Commits (1e3156bed39a8d645f50cf4e21bbed611341d26a)

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