Update CONTRIBUTING.md (cosmos#288)

orijtech · Aug 24, 2017 · ac865eb · ac865eb
1 parent 7bec18f
commit ac865eb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,9 @@
 If you are working directly on this repository instead of forking it, please make sure
 that you follow the [git-flow](http://nvie.com/posts/a-successful-git-branching-model/)
 naming convention. 
-Your branch should start with `feature/your_feature_name`.
+Your branch should start with `feature/your_feature_name`. When there is a lot of development 
+happening on the `develop` branch, you should `rebase` your feature branch onto develop 
+regularly.
 
 If opening a PR against Ethermint, please use branch `develop` as the base branch
 for changes. 
@@ -11,3 +13,4 @@ for changes.
 Please make sure that all tests run with `make test` pass.
 
 
+