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.git
commit 90288b44a544278193a37a20febc210bb4f0cdee Author: lprimak <[email protected]> AuthorDate: Tue Jun 16 11:57:24 2026 -0500 * chore(asf.yaml): correct merge buttons are now enabled (squash, rebase) and merge --- .asf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 678955ec0..de2b703bc 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -29,8 +29,8 @@ github: discussions: true enabled_merge_buttons: squash: true - merge: true - rebase: false + merge: false + rebase: true rulesets: - name: "Branch Protection" type: branch
