This is an automated email from the ASF dual-hosted git repository. jacopoc pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 15930bd309d7bdc31949b269afde5374a3f4f18a Author: Jacopo Cappellato <[email protected]> AuthorDate: Sat May 16 10:31:32 2026 +0200 Add reference to documentation, clean up comments in .asf.yaml and make merge button configuration consistent with required_linear_history --- .asf.yaml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 1010b98474..09814a0ec5 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -13,6 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# This file is used to configure ASF GitHub repositories. +# It is used by the ASF GitHub bot to automate various tasks such as labeling, +# merging, and notifications. +# For more information, see https://github.com/apache/infrastructure-asfyaml/blob/main/README.md + github: description: "Apache OFBiz is an open source product for the automation of enterprise processes. It includes framework components and business applications for ERP, CRM, E-Business/E-Commerce, Supply Chain Management and Manufacturing Resource Planning. OFBiz provides a foundation and starting point for reliable, secure and scalable enterprise solutions." homepage: https://ofbiz.apache.org/ @@ -32,20 +37,13 @@ github: - content - geospatial - hacktoberfest + enabled_merge_buttons: - # enable squash button: + merge: false + rebase: true squash: true - # default commit message when merging with a squash commit - # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC squash_commit_message: PR_TITLE_AND_DESC - # enable merge button: - merge: true - # default commit message when merging with a merge commit - # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_DESC - merge_commit_message: PR_TITLE_AND_DESC - # enable rebase button: - rebase: true - + rulesets: - name: "Default Branch Protection" type: branch
