Skip to content

Commit f7f988c

Browse files
authored
Merge pull request #128 from aros-development-team/mergify/Kalamatee/config-update
ci(Mergify): configuration update
2 parents 5eb82ab + 78321de commit f7f988c

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

.github/mergify.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
# .github/mergify.yml
22
pull_request_rules:
3-
- name: "Auto approve and merge PRs from master to azure-pipelines"
3+
- name: "Auto approve and merge PR from master to azure-pipelines"
44
conditions:
55
- "base=azure-pipelines" # Target branch is azure-pipelines
66
- "head=master" # Source branch is master
77
actions:
8-
approve:
9-
# Approve the PR
10-
message: "Auto-approved because it's from master to azure-pipelines."
118
merge:
12-
# Merge the PR once it's approved
13-
method: squash
14-
commit_message: "Sync master into azure-pipelines"
15-
merge_commit_message: "Automated PR to sync master into azure-pipelines"
16-
strict: false # Allow the merge to happen even if there are merge conflicts (optional)
9+
method: "squash" # Merge method (can be "merge", "squash", or "rebase")

0 commit comments

Comments
 (0)