Commit Graph

4 Commits

Author SHA1 Message Date
Stefan Weil
2c374aa3b7 Update GitHub action eps1lon/actions-label-merge-conflict
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2024-03-23 18:43:39 +01:00
Ashish Kurmi
bcff13777a ci: add minimum GitHub token permissions for workflow
Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io>
2022-10-02 14:40:14 -07:00
Pedro Beschorner Marin
ec4c2735f1 Set new labels to templates and workflows 2021-04-04 14:13:14 -03:00
Lars Kiesow
dfa3fcc6e9
Automate Conflict Check for Pull Requests
This patch adds a simple GitHub Actions workflow which will
automatically check open pull requests on code changes, adding a comment
and a label if the pull request has conflicts. The label will
automatically be removed again once the conflict has been resolved.

We use this for a while now with opencast and it really helps since
people do not have to manually check if their pull requests need an
update any longer.

An example, of hoe this looks in action can be found at
https://github.com/opencast/opencast/pull/2053#issuecomment-734987582
2020-12-04 00:59:35 +01:00