aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEdward Wang <[email protected]>2024-03-04 09:53:05 -0800
committerGitHub <[email protected]>2024-03-04 09:53:05 -0800
commit9308bec790269043f87cec1ddbb7ea6e7a5a5f1d (patch)
tree3bd9eb2a2c6df3edbcd465b809e8e32e871796ca
parent45791f63455267e41191e03d8895704fe59f7b98 (diff)
downloadpingora-9308bec790269043f87cec1ddbb7ea6e7a5a5f1d.tar.gz
pingora-9308bec790269043f87cec1ddbb7ea6e7a5a5f1d.zip
Update contributing guide with PR and rebase process (#108)
-rw-r--r--.github/CONTRIBUTING.md14
1 files changed, 10 insertions, 4 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 383a2be..fe5ce7f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -26,10 +26,16 @@ design decisions to be made.
## Making a PR
After you've filed an issue, you can make your PR referencing that issue number. Once you open your
-PR, it will be labelled _needs review_. A maintainer will review your PR as soon as they can. The
-reviewer may ask for changes - they will mark the PR as _changes requested_ and _work in progress_
-and will give you details about the requested changes. Feel free to ask lots of questions! The
-maintainers are there to help you.
+PR, it will be labelled _Needs Review_. A maintainer will review your PR as soon as they can. The
+reviewer may ask for changes - they will mark the PR as _Changes Requested_ and will give you
+details about the requested changes. Feel free to ask lots of questions! The maintainers are there
+to help you.
+
+Once we (the maintainers) decide to accept your change, we will label your PR as _Accepted_.
+Later (usually within a week or two), we will rebase your commits onto the `main` branch in a
+separate PR, batched alongside other _Accepted_ commits and any internal changes. (This process
+allows us to sync the state of our internal repository with the public repository.) Once your
+change lands in `main`, we will close your PR.
### Caveats