This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro-site.git
The following commit(s) were added to refs/heads/main by this push:
new 4a616ff8a chore(asf.yaml): enable rebase-and-merge
4a616ff8a is described below
commit 4a616ff8a6d5c244755d03d040b11aca3b9b2b6b
Author: lprimak <[email protected]>
AuthorDate: Wed Jun 17 16:27:52 2026 -0500
chore(asf.yaml): enable rebase-and-merge
---
.asf.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.asf.yaml b/.asf.yaml
index d887d726c..0338a10d7 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -28,7 +28,7 @@ github:
enabled_merge_buttons:
squash: true
merge: false
- rebase: false
+ rebase: true
rulesets:
- name: "Default Branch Protection"
