You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ga...@apache.org on 2023/03/07 12:58:42 UTC
[xmlgraphics-commons] branch main updated: Remove plain merge; add rebase merge (#17)
This is an automated email from the ASF dual-hosted git repository.
gadams pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-commons.git
The following commit(s) were added to refs/heads/main by this push:
new 7c0bd73 Remove plain merge; add rebase merge (#17)
7c0bd73 is described below
commit 7c0bd731e1e6fcc34b7b1cdd71206b97966904d1
Author: Glenn Adams <gl...@skynav.com>
AuthorDate: Tue Mar 7 06:58:39 2023 -0600
Remove plain merge; add rebase merge (#17)
---
.asf.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 9f3342c..1f7913f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -5,9 +5,9 @@ github:
- xgc
- apache
enabled_merge_buttons:
+ merge: false # disable non-squashing merge
squash: true
- merge: true
- rebase: false
+ rebase: true
protected_branches:
main:
strict: true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org