Skip to content

Commit

Permalink
Merge pull request #56 from bobvanderlinden/pr-reschedule-after-update
Browse files Browse the repository at this point in the history
Always reschedule pull request after updating branch
  • Loading branch information
probot-auto-merge[bot] committed Sep 30, 2018
2 parents f6331dc + d3f74af commit 7fab030
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/pull-request-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export type PullRequestAction = 'reschedule' | 'update_branch' | 'merge' | 'dele
export type PullRequestActions
= []
| ['reschedule']
| ['update_branch']
| ['update_branch', 'reschedule']
| ['merge']
| ['merge', 'delete_branch']

Expand Down Expand Up @@ -79,7 +79,7 @@ export function getPullRequestActions (
if (requiresBranchUpdate(pullRequestInfo) && config.updateBranch) {
return isInFork(pullRequestInfo)
? []
: ['update_branch']
: ['update_branch', 'reschedule']
}

return config.deleteBranchAfterMerge && !isInFork(pullRequestInfo)
Expand Down

0 comments on commit 7fab030

Please sign in to comment.