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

Proper selection of merge commit to squash commits onto for merge style PRs #552

Closed
wants to merge 1 commit into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Mar 30, 2020

Hi all,

Please review this change that properly selects the merge commit to squash eventual further commits onto in a merge-style PR.

Best regards,
Robin


Progress

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

Reviewers

  • Erik Helin (ehelin - Reviewer)

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 30, 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 30, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

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

Proper selection of merge commit to squash commits onto for merge style PRs

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 4 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 870bf7864dbf838bbede3f5a11092cbc7dd86cc8.

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

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

mlbridge bot commented Mar 30, 2020

Webrevs

@rwestberg
Copy link
Member Author

rwestberg commented Mar 30, 2020

/integrate

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

openjdk bot commented Mar 30, 2020

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

  • 870bf78: 339: Only show link to CONTRIBUTING.md if it exists
  • 73e43b7: vcs: handle clean renames in combined diff parser
  • 5ed1133: jcheck: add asString when parsing INI values
  • eef8fff: merge-bot: minor improvements to message

Your commit was automatically rebased without conflicts.

Pushed as commit c0a0a50.

@mlbridge
Copy link

mlbridge bot commented Mar 30, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: c0a0a50
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-03-30 15:00:31 +0000
URL: https://git.openjdk.java.net/skara/commit/c0a0a508

Proper selection of merge commit to squash commits onto for merge style PRs

Reviewed-by: ehelin

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

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