@@ -98,18 +98,14 @@ export default async (pluginConfig, context) => {
9898 // --- 8. Merge the Pull Request ---
9999 logger . log ( `Attempting to merge Pull Request #${ pr . number } ` ) ;
100100 try {
101- if ( pr . mergeable ) {
102- await octokit . rest . pulls . merge ( {
103- owner : umbrellaRepoOwner ,
104- repo : umbrellaRepoName ,
105- pull_number : pr . number ,
106- commit_title : `${ commitMessage } (PR #${ pr . number } )` ,
107- merge_method : 'squash' ,
108- } ) ;
109- logger . log ( `Pull Request #${ pr . number } merged successfully.` ) ;
110- } else {
111- logger . warn ( `Pull Request #${ pr . number } is not mergeable. It might require manual intervention.` ) ;
112- }
101+ await octokit . rest . pulls . merge ( {
102+ owner : umbrellaRepoOwner ,
103+ repo : umbrellaRepoName ,
104+ pull_number : pr . number ,
105+ commit_title : `${ commitMessage } (PR #${ pr . number } )` ,
106+ merge_method : 'squash' ,
107+ } ) ;
108+ logger . log ( `Pull Request #${ pr . number } merged successfully.` ) ;
113109 } catch ( mergeError ) {
114110 logger . error ( `Failed to merge PR #${ pr . number } : ${ mergeError . message } ` ) ;
115111 logger . error ( `Details: ${ JSON . stringify ( mergeError . response ?. data , null , 2 ) } ` ) ;
0 commit comments