diff options
| author | Jon Atack <jon@atack.com> | 2019-03-20 12:02:19 +0100 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2019-03-20 12:10:35 +0100 |
| commit | 0d9d2b385b8c32ab422964128d10b99cfcad2612 (patch) | |
| tree | 09f4169ad862d4a2fc30022fae13eeb1407f9b14 /CONTRIBUTING.md | |
| parent | e45b7f20e651898c5b476c2364fd9d1fd583f3af (diff) | |
| download | bitcoin-0d9d2b385b8c32ab422964128d10b99cfcad2612.tar.xz | |
Doc: update ACK description in CONTRIBUTING.md
as per https://github.com/bitcoin/bitcoin/pull/15617#issuecomment-474773043 and https://github.com/bitcoin/bitcoin/pull/15626#discussion_r267286564.
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82c96efa0c..007ebd7ccf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -239,7 +239,10 @@ consensus to merge a pull request (remember that discussions may have been spread out over GitHub, mailing list and IRC discussions). The following language is used within pull-request comments: - - ACK means "I have tested the code and I agree it should be merged"; + - (t)ACK means "I have tested the code and I agree it should be merged", involving + change-specific manual testing in addition to running the unit and functional + tests, and in case it is not obvious how the manual testing was done, it should + be described; - NACK means "I disagree this should be merged", and must be accompanied by sound technical justification (or in certain cases of copyright/patent/licensing issues, legal justification). NACKs without accompanying reasoning may be |