summary refs log tree commit diff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorHillery Shay <shaysquared@gmail.com>2021-08-10 06:35:54 -0700
committerGitHub <noreply@github.com>2021-08-10 13:35:54 +0000
commit52bfa2d59a5c372dec3204b20efbe19953b53122 (patch)
tree4e53c9b716442ed023b0ce9c85721116b9e68b0a /CONTRIBUTING.md
parentMerge branch 'master' into develop (diff)
downloadsynapse-52bfa2d59a5c372dec3204b20efbe19953b53122.tar.xz
Update contributing.md to warn against rebasing an open PR. (#10563)
Signed-off-by: H.Shay <shaysquared@gmail.com>
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7eef23419..4486a4b2cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -252,6 +252,7 @@ To prepare a Pull Request, please:
 4. on GitHub, [create the Pull Request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request);
 5. add a [changelog entry](#changelog) and push it to your Pull Request;
 6. for most contributors, that's all - however, if you are a member of the organization `matrix-org`, on GitHub, please request a review from `matrix.org / Synapse Core`.
+7. if you need to update your PR, please avoid rebasing and just add new commits to your branch.
 
 
 ## Changelog