From bc7b2e9c2ef9de676e3bedbd54862072738bfa5b Mon Sep 17 00:00:00 2001 From: Alya Abbott Date: Thu, 17 Oct 2024 17:03:57 -0700 Subject: [PATCH] contributor docs: Link to new guide on continuing prior work. --- CONTRIBUTING.md | 6 ++---- docs/contributing/commit-discipline.md | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 392a8f2d21..abedc8589e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -280,10 +280,8 @@ labels. codebase, you can also find another "help wanted" issue in the same area to work on. - **What if there is already a pull request for the issue I want to work on?** - Start by reviewing the existing work. If you agree with the approach, you can - use the existing pull request (PR) as a starting point for your contribution. If - you think a different approach is needed, you can post a new PR, with a comment that clearly - explains _why_ you decided to start from scratch. + See our [guide on continuing unfinished + work](https://zulip.readthedocs.io/en/latest/contributing/continuing-unfinished-work.html). - **What if I ask if someone is still working on an issue, and they don't respond?** If you don't get a reply within 2-3 days, go ahead and post a comment that you are working on the issue, and submit a pull request. If the original diff --git a/docs/contributing/commit-discipline.md b/docs/contributing/commit-discipline.md index 8afb7310f4..5cce38a19a 100644 --- a/docs/contributing/commit-discipline.md +++ b/docs/contributing/commit-discipline.md @@ -300,6 +300,10 @@ the end of your commit message: Co-authored-by: Greg Price +You should always give credit where credit is due. See our [guide on continuing +unfinished work](../contributing/continuing-unfinished-work.md) for step-by-step +guidance on continuing work someone else has started. + You can also add other notes, such as `Reported-by:`, `Debugged-by:`, or `Suggested-by:`, but we don't typically do so.