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

374: Do not show integration message when PR has merge conflict #590

Closed
wants to merge 1 commit into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Apr 20, 2020

Hi all,

Please review this change that waits with posting the integration ready message if a PR has a merge conflict.

Best regards,
Robin


Progress

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

Issue

  • SKARA-374: Do not show integration message when PR has merge conflict

Reviewers

  • Erik Helin (ehelin - Reviewer)

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 20, 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 20, 2020

Webrevs

edvbld
edvbld approved these changes Apr 20, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Apr 20, 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:

374: Do not show integration message when PR has merge conflict

Reviewed-by: ehelin
  • 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.

There are currently no new commits on the master branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate 15cf5f695367f7b30b5507a57f2c9a8c231bf91f.

➡️ 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 Apr 20, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 20, 2020

/integrate

@openjdk openjdk bot closed this Apr 20, 2020
@openjdk openjdk bot added integrated and removed ready labels Apr 20, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Apr 20, 2020

@rwestberg
Pushed as commit 7b79f85.

@openjdk openjdk bot removed the rfr label Apr 20, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 20, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 7b79f85
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-04-20 11:44:48 +0000
URL: https://git.openjdk.java.net/skara/commit/7b79f857

374: Do not show integration message when PR has merge conflict

Reviewed-by: ehelin

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java

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