Commit Graph

2 Commits (4e2fbd3ef1dd0b555c3e9fdaab78cb9ecdbb1c04)

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