Skip to content

Commit

Permalink
Merge pull request #495 from alexwaters/readme
Browse files Browse the repository at this point in the history
Updated readme file
  • Loading branch information
Jeff Garzik committed Sep 6, 2011
2 parents 7464e64 + adb8a55 commit 3a7c4d8
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ Developers work in their own trees, then submit pull requests when they think th

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 development forums: http://www.bitcoin.org/smf/index.php?board=6.0
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 (by who? need people willing to be quality assurance testers), and periodically pushed to the subversion repo to become the official, stable, released bitcoin.
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 [email protected].


Feature branches are created when there are major new features being worked on by several people.
Feature branches are created when there are major new features being worked on by several people.

0 comments on commit 3a7c4d8

Please sign in to comment.