diff options
| author | Dan <danjm.com@gmail.com> | 2018-05-14 21:30:50 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-05-14 22:14:50 +0800 |
| commit | 6bc8cc819a16118acc010d0efdec90afbda14590 (patch) | |
| tree | 2d2c35604af2e6a44c5f3ecb5c901a52980710d8 /CONTRIBUTING.md | |
| parent | 0739618a61cfc383498e466f4fdeb5a25324598f (diff) | |
| download | tangerine-wallet-browser-6bc8cc819a16118acc010d0efdec90afbda14590.tar.gz tangerine-wallet-browser-6bc8cc819a16118acc010d0efdec90afbda14590.tar.zst tangerine-wallet-browser-6bc8cc819a16118acc010d0efdec90afbda14590.zip | |
Merge branch 'develop' into i3725-refactor-send-component-
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 6 |
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. |