Merge #15626: Docs: Update ACK description in CONTRIBUTING.md
0d9d2b385b Doc: update ACK description in CONTRIBUTING.md (Jon Atack)
Pull request description:
as per https://github.com/bitcoin/bitcoin/pull/15617#issuecomment-474773043.
Edit:
as per https://github.com/bitcoin/bitcoin/pull/15617#issuecomment-474773043 and https://github.com/bitcoin/bitcoin/pull/15626#discussion_r267286564.
Tree-SHA512: 12df420d20338270bca310873c73d2f38b631c05cf8b3e5b2c1380f95936cb122687ba66b71de53348222efd5fed6d21e67f535a6ada689bf294dceec184a631
This commit is contained in:
1 file changed
+4
-1
+4
-1
@@ -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
|
spread out over GitHub, mailing list and IRC discussions). The following
|
||||||
language is used within pull-request comments:
|
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
|
- NACK means "I disagree this should be merged", and must be accompanied by
|
||||||
sound technical justification (or in certain cases of copyright/patent/licensing
|
sound technical justification (or in certain cases of copyright/patent/licensing
|
||||||
issues, legal justification). NACKs without accompanying reasoning may be
|
issues, legal justification). NACKs without accompanying reasoning may be
|
||||||
|
|||||||
Reference in new issue
Block a user