From f3bb30ee133d8ca44519e7c411e1b638cf8271ad Mon Sep 17 00:00:00 2001 From: Avery King Date: Mon, 11 Aug 2025 08:23:46 -0700 Subject: [PATCH] Clarify rebase notices Signed-off-by: Avery King --- CONTRIBUTING.md | 20 +++++++++----------- README.md | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d779a4691..6b5bf4faa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 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 -`main` branch due to a large effort to rebase off Audacity 3.7.1. At the time -of writing, things are going smoothly so far. View PR -https://codeberg.org/tenacityteam/tenacity/pulls/527 to see the progress on the +**At this time, pull requests must be made against the `audacity-3.7` branch. +If you had previously planned to open a pull request against `main`, please +rebase it against the `audacity-3.7-rebase` branch. See +https://codeberg.org/tenacityteam/tenacity/pulls/527 for progress on the rebase**. -**During the rebase, the rebase branch, `audacity-3.7-rebase`, will temporarily -become the default branch. Please base your PR off the `audacity-3.7-rebase` -branch and open a PR against the same branch. All other rules and procedures -regarding contributions will still apply as they did before. Thus, replace any -references to `main` below with `audacity-3.7-rebase`.** +**Contribution policies and procedures remain unchanged throughout the rebase. +Since the default branch is temporarily `audacity-3.7-rebase`, please replace +any references to `main` with `audacity-3.7-rebase` for the time being.** -**This notice (in bold) is temporary. Once removed, we will accept -contributions as we did before the rebase again.** +**This notice (in bold) is temporary. Once the rebase is finished, this notice +will be removed entirely.** ## The Use of LLMs and AI in Contributions **Please read this section IN FULL before continuing with your contribution. diff --git a/README.md b/README.md index 8a2133970..31cc237f1 100644 --- a/README.md +++ b/README.md @@ -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.