Clarify rebase notices

Signed-off-by: Avery King <gperson@disroot.org>
This commit is contained in:
Avery King
2025-08-11 08:23:46 -07:00
parent 311122dda2
commit f3bb30ee13
2 changed files with 10 additions and 12 deletions

View File

@@ -4,20 +4,18 @@ Thanks for showing your interest to contribute, your contribution is very
valuable to us as people like **you** help us build Tenacity. Some guidelines valuable to us as people like **you** help us build Tenacity. Some guidelines
have been put in place in an effort to keep the codebase clean. have been put in place in an effort to keep the codebase clean.
**At this time, we are halting acceptance of new pull requests against the **At this time, pull requests must be made against the `audacity-3.7` branch.
`main` branch due to a large effort to rebase off Audacity 3.7.1. At the time If you had previously planned to open a pull request against `main`, please
of writing, things are going smoothly so far. View PR rebase it against the `audacity-3.7-rebase` branch. See
https://codeberg.org/tenacityteam/tenacity/pulls/527 to see the progress on the https://codeberg.org/tenacityteam/tenacity/pulls/527 for progress on the
rebase**. rebase**.
**During the rebase, the rebase branch, `audacity-3.7-rebase`, will temporarily **Contribution policies and procedures remain unchanged throughout the rebase.
become the default branch. Please base your PR off the `audacity-3.7-rebase` Since the default branch is temporarily `audacity-3.7-rebase`, please replace
branch and open a PR against the same branch. All other rules and procedures any references to `main` with `audacity-3.7-rebase` for the time being.**
regarding contributions will still apply as they did before. Thus, replace any
references to `main` below with `audacity-3.7-rebase`.**
**This notice (in bold) is temporary. Once removed, we will accept **This notice (in bold) is temporary. Once the rebase is finished, this notice
contributions as we did before the rebase again.** will be removed entirely.**
## The Use of LLMs and AI in Contributions ## The Use of LLMs and AI in Contributions
**Please read this section IN FULL before continuing with your contribution. **Please read this section IN FULL before continuing with your contribution.

View File

@@ -1,4 +1,4 @@
**We are currently undergoing a major rebase off Audacity 3.7.1. See PR https://codeberg.org/tenacityteam/tenacity/pulls/527 for progress. During this time, we will NOT accept pull requests against `main`. Please (re)base them off the `audacity-3.7-rebase` branch instead.** **We are currently undergoing a major rebase off Audacity 3.7.1. See PR https://codeberg.org/tenacityteam/tenacity/pulls/527 for progress. During this time, the default branch will be `audacity-3.7-rebase` instead. If you had a PR previously planned, please rebase it off that branch.**
For more information on the situation, please see https://fosstodon.org/@tenacity/113731514298404501. We are still accepting contributions elsewhere. We resume accepting contributions when the rebase is complete. Thank you for your understanding. For more information on the situation, please see https://fosstodon.org/@tenacity/113731514298404501. We are still accepting contributions elsewhere. We resume accepting contributions when the rebase is complete. Thank you for your understanding.