Commit Graph

2 Commits (d1677300a433500c7e389297dbd3c6cdd3db9617)

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