aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-04-26 03:11:06 +0800
committerGitHub <noreply@github.com>2018-04-26 03:11:06 +0800
commit806a3c7eff5c68695f2e6aeb1cde477adb559452 (patch)
treecae6e9f3b768d5d9ab9dc50c9092d32ad1644821
parentb9e5ef97b21ce75a7acb944ac216197d6d355937 (diff)
parent1eb80cc46d1d375e36907992dc713c2d05ac5f7f (diff)
downloadtangerine-wallet-browser-806a3c7eff5c68695f2e6aeb1cde477adb559452.tar
tangerine-wallet-browser-806a3c7eff5c68695f2e6aeb1cde477adb559452.tar.gz
tangerine-wallet-browser-806a3c7eff5c68695f2e6aeb1cde477adb559452.tar.bz2
tangerine-wallet-browser-806a3c7eff5c68695f2e6aeb1cde477adb559452.tar.lz
tangerine-wallet-browser-806a3c7eff5c68695f2e6aeb1cde477adb559452.tar.xz
tangerine-wallet-browser-806a3c7eff5c68695f2e6aeb1cde477adb559452.tar.zst
tangerine-wallet-browser-806a3c7eff5c68695f2e6aeb1cde477adb559452.zip
Merge pull request #4080 from MetaMask/AddDevelopGuideToContributing
Add develop guide to contributing.md
-rw-r--r--CONTRIBUTING.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d2e5207b..8517eed70 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,12 +12,14 @@ For any new programmatic functionality, we like unit tests when possible, so if
### PR Format
-We use [waffle](https://waffle.io/) for project management, and it will automatically keep us organized if you do one simple thing:
-
If this PR closes the issue, add the line `Fixes #$ISSUE_NUMBER`. Ex. For closing issue 418, include the line `Fixes #418`.
If it doesn't close the issue but addresses it partially, just include a reference to the issue number, like `#418`.
+Submit your PR against the `develop` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `master` for production.
+
+If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `master` branch, but this PR will receive tighter scrutiny before merging.
+
## Before Merging
Make sure you get a `:thumbsup`, `:+1`, or `LGTM` from another collaborator before merging.