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

690: Merge commit message is not Merge jdk, but: Merge jdk #831

Closed
wants to merge 1 commit into from

Conversation

@edvbld
Copy link
Member

@edvbld edvbld commented Sep 18, 2020

Hi all,

please review this patch that makes it more clear what the expected and current commit messages are when showing the error for MergeMessageCheck.

Thanks,
Erik


Progress

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

Issue

  • SKARA-690: Merge commit message is not Merge jdk, but: Merge jdk

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 18, 2020

👋 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 changed the title 690 690: Merge commit message is not Merge jdk, but: Merge jdk Sep 18, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 18, 2020

⚠️ @edvbld This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the rfr label Sep 18, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 18, 2020

@edvbld The following label will be automatically applied to this pull request: bots.

When this pull request is ready to be reviewed, an RFR email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label (add|remove) "label" command.

@openjdk openjdk bot added the bots label Sep 18, 2020
Copy link
Member

@rwestberg rwestberg left a comment

Looks good, just one comment!

.jcheck/conf Outdated Show resolved Hide resolved
@openjdk
Copy link

@openjdk openjdk bot commented Sep 18, 2020

@edvbld This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

690: Merge commit message is not Merge jdk, but: Merge jdk

Reviewed-by: rwestberg
  • 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 /issue command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch:

  • ae829d6: 692: Improve integration message

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

➡️ 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 Sep 18, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 18, 2020

Webrevs

690
@edvbld edvbld force-pushed the edvbld:690 branch from fc74610 to 8a9fb6a Sep 18, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Sep 18, 2020

/integrate

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

@openjdk openjdk bot commented Sep 18, 2020

@edvbld Since your change was applied there has been 1 commit pushed to the master branch:

  • ae829d6: 692: Improve integration message

Your commit was automatically rebased without conflicts.

Pushed as commit 87ac653.

💡 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

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