From 97ae9632bafcb1c836f7d63b2d96422946e62900 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Wed, 22 Aug 2018 16:10:57 +0200 Subject: [PATCH] Move to CONTRIBUTING.md --- .github/PULL_REQUEST_TEMPLATE.md | 5 +---- CONTRIBUTING.md | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 76ccb0d6bd..5b7c7d6dcf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,10 +4,7 @@ v Before smashing the submit button please review the checkboxes. v If a checkbox is n/a - please still include it but + a little note why ☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > --> -- Targeted PR against correct branch: - - `release/vxx.yy.zz` for a merge into a release candidate - - `master` for a merge of a release - - `develop` in the usual case +- Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/cosmos-sdk/blob/develop/CONTRIBUTING.md#pr-targeting)) - [ ] Linked to github-issue with discussion and accepted design OR link to spec that describes this work. - [ ] Updated all relevant documentation (`docs/`) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b7ad81fd0..e1a5e7c1f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -133,6 +133,13 @@ Libraries need not follow the model strictly, but would be wise to. The SDK utilizes [semantic versioning](https://semver.org/). +### PR Targeting + +Ensure that you base and target your PR on the correct branch: + - `release/vxx.yy.zz` for a merge into a release candidate + - `master` for a merge of a release + - `develop` in the usual case + ### Development Procedure: - the latest state of development is on `develop` - `develop` must never fail `make test` or `make test_cli`