Skip to content

Commit 90f8a1e

Browse files
committed
chore(ci): loosen approval requirement and switch to rebase merge strategy
Why this change was needed: The project aims for faster CI/CD iteration cycles while maintaining cleaner project history. The dual approval requirement was creating bottlenecks for smaller changes and feature branches. Rebase merging produces a linear, more readable history that simplifies debugging and blame attribution. Problem solved: Reduced friction in the PR review process by lowering the approval threshold, while maintaining code quality. Rebase merging eliminates merge commits that clutter the git log and make history harder to follow. What changed: - Lowered approved-reviews-by threshold from 2 to 1 - Changed merge method from merge commits to rebase strategy
1 parent 465659d commit 90f8a1e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.mergify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ pull_request_rules:
1111
- "#check-pending=0"
1212
- linear-history
1313
- and:
14-
- "#approved-reviews-by>=2"
14+
- "#approved-reviews-by>=1"
1515
- "#changes-requested-reviews-by=0"
1616
# https://doc.mergify.io/examples.html#require-all-requested-reviews-to-be-approved
1717
- "#review-requested=0"
1818
actions: &merge
1919
merge:
20-
method: merge
20+
method: rebase
2121
- name: automatic merge on special label
2222
conditions:
2323
- and: *base_checks

0 commit comments

Comments
 (0)