Commit Graph

2 Commits (f6b325b1610e650597063b6bf9ebf7d1854923d5)

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