amahi / android

Amahi Android App
GNU General Public License v3.0
164 stars 279 forks source link

GitHub action for merge conflict notification #747

Closed chirag-jn closed 3 years ago

chirag-jn commented 3 years ago

Currently, there's no notification for the developer/maintainer whenever there's a merge conflict in a PR.

Using this GitHub action, whenever there's a merge conflict in a PR due to some changes in the development tree, the PR will be labelled as "conflicting" and the action will post a comment on the PR saying that the conflict must be resolved.

Ref: https://baywet.github.io/pull-request-conflict-github-workflow/