diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 15:12:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 15:12:17 +0200 |
| commit | 19366be186a9a2efff1e6abfe8db59cd9f5f5843 (patch) | |
| tree | 3abb4adeab1a4e86a08bb5bfe61dedf8be178a1c /README.md | |
| parent | 249c6818f171b75930736872d61b0cdcda7e9832 (diff) | |
| parent | a35ee9633690fbadc001b2d8fe1dd3ebb852dc25 (diff) | |
| download | bitcoin-19366be186a9a2efff1e6abfe8db59cd9f5f5843.tar.xz | |
Merge remote-tracking branch 'satoshi/qtui'
Conflicts (resolved by copying files from remote branch):
.gitignore
src/cryptopp/cpu.cpp
src/cryptopp/cpu.h
src/cryptopp/cryptlib.h
src/cryptopp/iterhash.h
src/cryptopp/misc.h
src/cryptopp/secblock.h
src/cryptopp/sha.cpp
src/cryptopp/sha.h
src/cryptopp/smartptr.h
src/json/json_spirit_reader.cpp
src/json/json_spirit_value.cpp
src/json/json_spirit_writer.cpp
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/README.md b/README.md new file mode 100644 index 0000000000..ab328adbff --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +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 development forums: http://www.bitcoin.org/smf/index.php?board=6.0 +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. + + +Feature branches are created when there are major new features being worked on by several people. |