Commit Graph

2 Commits (c7c16c4aa1eda2985ea9a08c81780cca477c9a52)

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)
6 months ago