summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2017-03-30 20:37:59 +0200
committerMarc Cornellà <marc.cornella@live.com>2017-03-30 20:37:59 +0200
commite0345bdd9d49b755d1ccf6030d43b95370120370 (patch)
tree198357477316af4702e0aa03ef7a0f9b801c5a22 /CONTRIBUTING.md
parentc51b132a7b5334737177a19dd1fe59c7ff7a7767 (diff)
parent573df1a8ffa8167e29a8e403a0a0caedac84c972 (diff)
downloadzsh-e0345bdd9d49b755d1ccf6030d43b95370120370.tar.gz
zsh-e0345bdd9d49b755d1ccf6030d43b95370120370.tar.bz2
zsh-e0345bdd9d49b755d1ccf6030d43b95370120370.zip
Merge branch 'ncanceill-add-contributing-file' into add-contributing-file
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cbcd75907..ac263fd18 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -72,13 +72,13 @@ _"Fixes #XXXX"_ for issue number XXXX.
### You have a solution
Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
-your [problem](#you-have-a-problem), and any pending PR covering your solution.
+your [problem](#you-have-a-problem), and any pending/merged/rejected PR covering your solution.
If the solution is already reported, try it out and +1 the pull request if the
solution works ok. On the other hand, if you think your solution is better, post
-it so we can have both solutions to compare.
+it with a reference to the other one so we can have both solutions to compare.
-If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin
+If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin
maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
### You have an addition
@@ -86,8 +86,8 @@ maintainers) by mentioning their GitHub handle (starting with `@`) in your messa
Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now)
send themes for now.
-Please be so kind as to [search](#use-the-search-luke) for any pending PR covering or
-related to what you want to add.
+Please be so kind as to [search](#use-the-search-luke) for any pending, merged or rejected Pull Requests
+covering or related to what you want to add.
If you find one, try it out and work with the author on a common solution.