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

pr: update error message for backports #1101

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Mar 30, 2021

Hi all,

please review this patch that fixes the Markdown for the error message when a commit cannot be automatically backported.

Thanks,
Erik


Progress

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

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1101/head:pull/1101
$ git checkout pull/1101

Update a local copy of the PR:
$ git checkout pull/1101
$ git pull https://git.openjdk.java.net/skara pull/1101/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1101

View PR using the GUI difftool:
$ git pr show -t 1101

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1101.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 30, 2021

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Mar 30, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 30, 2021

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

openjdk bot commented Mar 30, 2021

@edvbld This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

pr: update error message for backports

Reviewed-by: rwestberg

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ 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 Mar 30, 2021
@edvbld
Copy link
Member Author

edvbld commented Mar 30, 2021

/integrate

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

openjdk bot commented Mar 30, 2021

@edvbld Since your change was applied there have been 2 commits pushed to the master branch:

  • 99e01cc: 659: Multi-line commands aren't filtered properly
  • c33a832: 940: Exception during item execution: has integrated label but no integration comment

Your commit was automatically rebased without conflicts.

Pushed as commit 9e66034.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

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