aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-09-18 11:55:41 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-09-18 12:47:49 +0200
commit0465c41c847ddee7eeb5caefb164149400ff8395 (patch)
treedab8b1a20ad888499939b04d1564f47f93e424b7 /README.md
parente122e42354149386159fbff82fbd66e7a8ba1fdb (diff)
move current qt specific readme to doc/, restore original README.md
Diffstat (limited to 'README.md')
-rw-r--r--README.md29
1 files changed, 29 insertions, 0 deletions
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..67fa93d371
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+
+Bitcoin integration/staging tree
+
+Development process
+===================
+
+Developers work in their own trees, then submit pull requests when
+they think their feature or bug fix is ready.
+
+If it is a simple/trivial/non-controversial change, then one of the
+bitcoin development team members simply pulls it.
+
+If it is a more complicated or potentially controversial
+change, then the patch submitter will be asked to start a
+discussion (if they haven't already) on the mailing list:
+http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development
+
+The patch will be accepted if there is broad consensus that it is a
+good thing. Developers should expect to rework and resubmit patches
+if they don't match the project's coding conventions (see coding.txt)
+or are controversial.
+
+The master branch is regularly built and tested, but is not guaranteed
+to be completely stable. Tags are regularly created to indicate new
+official, stable release versions of Bitcoin. If you would like to
+help test the Bitcoin core, please contact QA@Bitcoin.org.
+
+Feature branches are created when there are major new features being
+worked on by several people.