File tree Expand file tree Collapse file tree 1 file changed +14
-4
lines changed
extension/tasks/dependabotV2/utils/dependabot-cli Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -119,10 +119,20 @@ export class DependabotOutputProcessor implements IDependabotUpdateOutputProcess
119
119
autoComplete : this . taskInputs . setAutoComplete
120
120
? {
121
121
ignorePolicyConfigIds : this . taskInputs . autoCompleteIgnoreConfigIds ,
122
- mergeStrategy :
123
- GitPullRequestMergeStrategy [
124
- this . taskInputs . mergeStrategy as keyof typeof GitPullRequestMergeStrategy
125
- ] ,
122
+ mergeStrategy : ( ( ) => {
123
+ switch ( this . taskInputs . mergeStrategy ) {
124
+ case 'noFastForward' :
125
+ return GitPullRequestMergeStrategy . NoFastForward ;
126
+ case 'squash' :
127
+ return GitPullRequestMergeStrategy . Squash ;
128
+ case 'rebase' :
129
+ return GitPullRequestMergeStrategy . Rebase ;
130
+ case 'rebaseMerge' :
131
+ return GitPullRequestMergeStrategy . RebaseMerge ;
132
+ default :
133
+ return GitPullRequestMergeStrategy . Squash ;
134
+ }
135
+ } ) ( ) ,
126
136
}
127
137
: undefined ,
128
138
assignees : update . config . assignees ,
You can’t perform that action at this time.
0 commit comments