From c7f6777e48cbe2ef3b2b2f1aa1bb3baf936d506e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 May 2022 19:18:19 +0100 Subject: [PATCH] Update CONTRIBUTING.md (#2380) --- CONTRIBUTING.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 44c93dd42..e495d19ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -249,7 +249,10 @@ Merge Strategy The preferred method for merging pull requests is squash merging to keep the commit history trim, but it is up to the discretion of the team member merging -the change. When stacking pull requests, you may wish to do the following: +the change. We do not support rebase merges due to `allchange` being unable to +handle them. When merging make sure to leave the default commit title, or +at least leave the PR number at the end in brackets like by default. +When stacking pull requests, you may wish to do the following: 1. Branch from develop to your branch (branch1), push commits onto it and open a pull request 2. Branch from your base branch (branch1) to your work branch (branch2), push commits and open a pull request configuring the base to be branch1, saying in the description that it is based on your other PR.