Skip to content

Commit bbc436e

Browse files
committed
Merge #15626: Docs: Update ACK description in CONTRIBUTING.md
0d9d2b3 Doc: update ACK description in CONTRIBUTING.md (Jon Atack) Pull request description: as per bitcoin/bitcoin#15617 (comment). Edit: as per bitcoin/bitcoin#15617 (comment) and bitcoin/bitcoin#15626 (comment). Tree-SHA512: 12df420d20338270bca310873c73d2f38b631c05cf8b3e5b2c1380f95936cb122687ba66b71de53348222efd5fed6d21e67f535a6ada689bf294dceec184a631
2 parents 93623ee + 0d9d2b3 commit bbc436e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,10 @@ consensus to merge a pull request (remember that discussions may have been
239239
spread out over GitHub, mailing list and IRC discussions). The following
240240
language is used within pull-request comments:
241241

242-
- ACK means "I have tested the code and I agree it should be merged";
242+
- (t)ACK means "I have tested the code and I agree it should be merged", involving
243+
change-specific manual testing in addition to running the unit and functional
244+
tests, and in case it is not obvious how the manual testing was done, it should
245+
be described;
243246
- NACK means "I disagree this should be merged", and must be accompanied by
244247
sound technical justification (or in certain cases of copyright/patent/licensing
245248
issues, legal justification). NACKs without accompanying reasoning may be

0 commit comments

Comments
 (0)