Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from

Conversation

@rwestberg
Copy link
Member

@rwestberg rwestberg commented May 11, 2020

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

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 11, 2020

👋 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.

@openjdk openjdk bot added rfr bots labels May 11, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 11, 2020

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented May 11, 2020

@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.

@openjdk openjdk bot added the ready label May 11, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented May 12, 2020

/integrate

@openjdk openjdk bot closed this May 12, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels May 12, 2020
@openjdk
Copy link

@openjdk openjdk bot commented May 12, 2020

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.