do not invalidate approved PRs after a rebase from master #59
Conversation
* (hopefully) removing friction from PR approval flow, when an approved pull request becomes invalidated after a rebase from master change-type: patch
| # "update merge" is a merge commit that was created in the UI or via the API | ||
| # and merges the target branch into the pull request branch. These are | ||
| # commonly created by using the "Update branch" button in the UI. | ||
| ignore_update_merges: true |
There was a problem hiding this comment.
I am quite sure that this will have no effect on rebase merges, where each commit is rewritten. Policy-bot is only identifying the literal merge commit from master mixed in with other PR commits, a process we avoid using and block via Flowzone.
There was a problem hiding this comment.
Are you sure? From the description here, it may work (though I've not looked through their code).
There was a problem hiding this comment.
Yes, that is describing a merge commit (a commit with two parents) which is the same logic used for Flowzone to reject a PR for using the wrong type of master update. I am certain.
|
Approvals are only invalidated if the rebase is done by the approver, so they become an author/contributor and are no longer eligible for approvals. We could deploy a bot to provide rebases via comments like we used to have via VersionBot. Otherwise allowing contributors to approve leaves an opportunity for a compromised account to piggy-back changes on someone else's PR and self-approve. |
Fair enough, then I guess we have a couple of options: |
Pull request was closed
change-type: patch