diff options
| author | Ava Chow <github@achow101.com> | 2024-04-30 20:16:48 -0400 |
|---|---|---|
| committer | Ava Chow <github@achow101.com> | 2024-04-30 20:17:04 -0400 |
| commit | 842f7fdf786fcbbdf3df40522945813404f8a397 (patch) | |
| tree | 3f2f9df66df53ec0f1fd3bb4ad6b1263c77a8ed9 /CONTRIBUTING.md | |
| parent | 4df2d0c4ce7697648ec724d2057a60bd8d7d032f (diff) | |
| parent | 1ea8674316f2dce0005f6094b6ee111b045dd770 (diff) | |
Merge bitcoin/bitcoin#29645: doc: update release-process.md
1ea8674316f2dce0005f6094b6ee111b045dd770 [doc] update release-process.md and backports section of CONTRIBUTING (glozow)
Pull request description:
While doing various release process things for the first time, I noticed some of our docs are outdated and/or confusing.
ACKs for top commit:
achow101:
ACK 1ea8674316f2dce0005f6094b6ee111b045dd770
Tree-SHA512: 4ad10d4ce2c33fe15cb02599353107bb72ecb867aefc6c120cfd5cdea42aa8fa3783f9e0218c2f3815f030e0694cc8fb24011ce88358a0206cb07416a256a962
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ac6db76ed..76a1c2754a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -418,11 +418,8 @@ Backporting Security and bug fixes can be backported from `master` to release branches. -If the backport is non-trivial, it may be appropriate to open an -additional PR to backport the change, but only after the original PR -has been merged. -Otherwise, backports will be done in batches and -the maintainers will use the proper `Needs backport (...)` labels +Maintainers will do backports in batches and +use the proper `Needs backport (...)` labels when needed (the original author does not need to worry about it). A backport should contain the following metadata in the commit body: |