aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-02-15 18:49:29 +0800
committerobscuren <geffobscura@gmail.com>2014-02-15 18:49:29 +0800
commit3fd5715872152fdd07c724dbbd8b1e06b062826b (patch)
tree82bfe216e2655a049d369742a99fef528ac73520
parent3a03d091eb337ac2d5fdec50b49bf9ac5cda86f5 (diff)
downloaddexon-3fd5715872152fdd07c724dbbd8b1e06b062826b.tar.gz
dexon-3fd5715872152fdd07c724dbbd8b1e06b062826b.tar.zst
dexon-3fd5715872152fdd07c724dbbd8b1e06b062826b.zip
Added git flow explanation
-rw-r--r--README.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/README.md b/README.md
index 4deaf4579..4fa8d3c5a 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,12 @@ Contribution
If you'd like to contribute to Ethereum Go please fork, fix, commit and
send a pull request. Commits who do not comply with the coding standards
-are ignored.
+are ignored. If you send pull requests make absolute sure that you
+commit on the `develop` branch and that you do not merge to master.
+Commits that are directly based on master are simply ignored.
+
+To make life easier try [git flow](http://nvie.com/posts/a-successful-git-branching-model/) it sets
+this all up and streamlines your work flow.
Coding standards
================