aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-02-15 19:10:25 +0800
committerobscuren <geffobscura@gmail.com>2014-02-15 19:10:25 +0800
commit9e57aac5eb58a475ef85b3929527248d6e5657a8 (patch)
treece7a45713a72dacc290c8e76113a0be03c70ef75 /README.md
parent3a03d091eb337ac2d5fdec50b49bf9ac5cda86f5 (diff)
parent1ba7ffe9f8eb468c11c20c933a85022a3b2dabe1 (diff)
downloaddexon-9e57aac5eb58a475ef85b3929527248d6e5657a8.tar
dexon-9e57aac5eb58a475ef85b3929527248d6e5657a8.tar.gz
dexon-9e57aac5eb58a475ef85b3929527248d6e5657a8.tar.bz2
dexon-9e57aac5eb58a475ef85b3929527248d6e5657a8.tar.lz
dexon-9e57aac5eb58a475ef85b3929527248d6e5657a8.tar.xz
dexon-9e57aac5eb58a475ef85b3929527248d6e5657a8.tar.zst
dexon-9e57aac5eb58a475ef85b3929527248d6e5657a8.zip
Merge branch 'release/0.2.2'
Diffstat (limited to 'README.md')
-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
================