| commit | 7c0bd731e1e6fcc34b7b1cdd71206b97966904d1 | [log] [tgz] |
|---|---|---|
| author | Glenn Adams <glenn@skynav.com> | Tue Mar 07 06:58:39 2023 -0600 |
| committer | GitHub <noreply@github.com> | Tue Mar 07 06:58:39 2023 -0600 |
| tree | b173c2dd0268c55f05bf4cbc922f13dd51cecdb9 | |
| parent | 1fbd9dffefd1b5376b75a70f5832bd307764db77 [diff] |
Remove plain merge; add rebase merge (#17)
diff --git a/.asf.yaml b/.asf.yaml index 9f3342c..1f7913f 100644 --- a/.asf.yaml +++ b/.asf.yaml
@@ -5,9 +5,9 @@ - xgc - apache enabled_merge_buttons: + merge: false # disable non-squashing merge squash: true - merge: true - rebase: false + rebase: true protected_branches: main: strict: true