Skip to content

Commit

Permalink
added action branding (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
Marko Schilde authored Jan 27, 2020
1 parent 6c57d08 commit 5981f89
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Purpose

This action checks all open Pull Requests for merge conflicts and marks them with a label.
This action checks all open Pull Requests for merge conflicts and marks them with a Github label.

![Github action in action](./demo.png)

Expand Down
3 changes: 3 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: 'Auto-label merge conflicts'
description: 'Github Action to automatically label PRs with "conflict" label'
author: 'Marko Schilde'
branding:
icon: 'alert-octagon'
color: 'red'
inputs:
CONFLICT_LABEL_NAME:
description: 'label name used to marked PRs with merge conflicts'
Expand Down

0 comments on commit 5981f89

Please sign in to comment.