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

318: The "outdated" label should be renamed to "merge-conlict" #531

Closed
wants to merge 1 commit into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Mar 23, 2020

Hi all,

Please review this change that renames the outdated label, and also drops the ready label for PRs with merge conflicts.

Best regards,
Robin


Progress

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

Issue

  • SKARA-318: The "outdated" label should be renamed to "merge-conlict"

Reviewers

  • Erik Helin (ehelin - Reviewer)

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 23, 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.

edvbld
edvbld approved these changes Mar 23, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good, thanks for remembering to fix git pr status!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 23, 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:

318: The "outdated" label should be renamed to "merge-conlict"

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.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch. Since 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 4e75eeb9c601601699f940d748f58fefa9d3c7f5.

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

@openjdk openjdk bot added the ready label Mar 23, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 23, 2020

Webrevs

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Mar 23, 2020

/integrate

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

@openjdk openjdk bot commented Mar 23, 2020

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

  • 4e75eeb: cli: better handling of git-jcheck --lax
  • b2b8de2: git-sync: use refspec instead of --prune-tags

Your commit was automatically rebased without conflicts.

Pushed as commit 8cbce58.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 23, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 8cbce58
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-03-23 08:13:10 +0000
URL: https://git.openjdk.java.net/skara/commit/8cbce58d

318: The "outdated" label should be renamed to "merge-conlict"

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
! cli/src/main/java/org/openjdk/skara/cli/pr/Utils.java

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