391: Abort merge if source branch merge isn't fast-forward

[rwestberg]

Hi all,

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.

Best regards,
Robin

---

Progress

• Change must not contain extraneous whitespace
• Change must be properly reviewed

Issue

• SKARA-391: Abort merge if source branch merge isn't fast-forward

Reviewers

• Jorn Vernee (jvernee - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/skara pull/622/head:pull/622
$ git checkout pull/622

[bridgekeeper]

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

[mlbridge]

Webrevs

• 00: Full (13c3cfe)

[openjdk]

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

391: Abort merge if source branch merge isn't fast-forward

Reviewed-by: jvernee

• If you would like to add a summary, use the /summary command.
• To credit additional contributors, use the /contributor command.
• To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 3 commits pushed to the master branch:

• 052aee4: 396: Add some additional help for empty PRs
• c558479: 397: Extend the additional errors section with hidden jcheck entries
• 6b6952e: 398: git webrev cannot handle a file named index.html

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 master into your branch, and then specify the current head hash when integrating, like this: /integrate 052aee4263f6fabddf5ef7d59fc334768fb93027.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[rwestberg]

/integrate

[openjdk]

@rwestberg The following commits have been pushed to master since your change was applied:

• 052aee4: 396: Add some additional help for empty PRs
• c558479: 397: Extend the additional errors section with hidden jcheck entries
• 6b6952e: 398: git webrev cannot handle a file named index.html

Your commit was automatically rebased without conflicts.

Pushed as commit ec12494.