391: Abort merge if source branch merge isn't fast-forward #622
Please review this change that ensures that the merge bot's local storage has been cleanly updated with the latest destination changes (through a fast-forward merge). Otherwise, it's possible for an error to be detected when doing the actual merge, even though it should succeed.
The text was updated successfully, but these errors were encountered:
@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type
Since the source branch of this PR was last updated there have been 3 commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge
@rwestberg The following commits have been pushed to master since your change was applied:
Your commit was automatically rebased without conflicts.
Pushed as commit ec12494.