This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 0126bb8e0 ci: enable rebase in some situation (#7074)
0126bb8e0 is described below
commit 0126bb8e0242d3339fb3fbf46f733da7ed498d3b
Author: 罗泽轩 <[email protected]>
AuthorDate: Wed May 18 17:29:54 2022 +0800
ci: enable rebase in some situation (#7074)
As discussed, now we decide to allow using rebase only when backport
multiple commits to the `release/xx` branch. Therefore we can preserve
the commit message.
Signed-off-by: spacewander <[email protected]>
---
.asf.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.asf.yaml b/.asf.yaml
index 78b072fa3..897c5ddbc 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -39,8 +39,10 @@ github:
enabled_merge_buttons:
squash: true
+ # **WARNING**: rebase should only be used
+ # when backport multiple commits to the `release/xx` branch
+ rebase: true
merge: false
- rebase: false
protected_branches:
master:
