Skip to content

Commit f88c6ed

Browse files
committed
chore(bousdsole): Set default merge to squash
The merge method in the boussole configuration file is now set to "squash" by default. This ensures that all merges will use the squash strategy unless otherwise specified.
1 parent 13b434c commit f88c6ed

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

.tekton/boussole.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ spec:
2323
value: "{{ git_auth_secret }}"
2424
- name: comment_sender
2525
value: "{{ sender }}"
26+
- name: merge_method
27+
value: "squash"
2628
#
2729
# Optional parameters (value is the default):
2830
#
@@ -44,8 +46,5 @@ spec:
4446
# - name: lgtm_review_event
4547
# value: "APPROVE"
4648
#
47-
# The merge method to use. Can be one of: merge, squash, rebase
48-
# - name: merge_method
49-
# value: "rebase"
5049
pipelineRef:
5150
name: boussole

0 commit comments

Comments
 (0)