baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

doc(maintainer): add contributor/needs-resolve-conflicts

Browse source 
Replace `contributor/needs-rebase` by `contributor/needs-resolve-conflicts`.
This commit is contained in:
Ludovic Fernandez 2017-05-21 14:53:31 +02:00
parent 8ad31d6eb4
commit 5b36b274a3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/MAINTAINER.md vendored
View file

@ -8,7 +8,7 @@ If we open/look an issue/PR, we must add a `king/*` and an `area/*`.
* `contributor/need-more-information`: we need more information from the contributor in order to analyze a problem. * `contributor/need-more-information`: we need more information from the contributor in order to analyze a problem.
* `contributor/waiting-for-corrections`: we need the contributor to take actions in order to move forward with a PR. **(only for PR)** * `contributor/waiting-for-corrections`: we need the contributor to take actions in order to move forward with a PR. **(only for PR)**
* `contributor/needs-rebase`: use it only when there is some conflicts (and an automatic rebase is not possible). **(only for PR)** _[bot, humans]_ * `contributor/needs-resolve-conflicts`: use it only when there is some conflicts (and an automatic rebase is not possible). **(only for PR)** _[bot, humans]_
### Kind ### Kind
@ -56,6 +56,7 @@ If we open/look an issue/PR, we must add a `king/*` and an `area/*`.
* `area/webui`: Web UI related. * `area/webui`: Web UI related.
* `area/infrastructure`: related to CI or Traefik building scripts. * `area/infrastructure`: related to CI or Traefik building scripts.
* `area/documentation`: regards improving/adding documentation. * `area/documentation`: regards improving/adding documentation.
* `area/cluster`: Traefik clustering related.
### Priority ### Priority