Skip to content

Commit 9d347e2

Browse files
committed
.asf.yaml: Enable rebase and merge option for PRs. This preserves linear history. We should prefer squash merges, but this is a useful option if we are 100% sure each commit will build and there is a high likelihood that a commit will either be reverted or cherry-picked.
1 parent 53a994c commit 9d347e2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.asf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ github:
4141
# can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC
4242
squash_commit_message: PR_TITLE
4343
merge: false
44-
rebase: false
44+
rebase: true
4545

4646
rulesets:
4747
- name: "Main Branch Protection"

0 commit comments

Comments
 (0)