File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1208,9 +1208,10 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
12081208
12091209 Logger . debug ( `Updating branch ${ model . prHeadBranchName } to ${ model . prBaseBranchName } - enter` , GitHubRepository . ID ) ;
12101210
1211- // When there are no conflicts, use the GitHub GraphQL API's UpdatePullRequestBranch mutation
1212- // This is simpler and more efficient than manually creating trees and commits
1213- if ( this . item . mergeable !== PullRequestMergeability . Conflict ) {
1211+ // When there are no conflicts, use the GitHub GraphQL API's UpdatePullRequestBranch mutation.
1212+ // This is simpler and more efficient than manually creating trees and commits.
1213+ // The GraphQL API is suitable for Mergeable and Behind states, which can be cleanly updated.
1214+ if ( this . item . mergeable === PullRequestMergeability . Mergeable || this . item . mergeable === PullRequestMergeability . Behind ) {
12141215 return this . updateBranchWithGraphQL ( ) ;
12151216 }
12161217
You can’t perform that action at this time.
0 commit comments