Commit Graph

2 Commits (1aadb911bd32a79c5a3957ee4b207c629df8c589)

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