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.

Sign up for GitHub

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

Jump to bottom

2150: Allow pull requests to have the title "Merge" #1602

Closed
wants to merge 2 commits into from
Closed

2150: Allow pull requests to have the title "Merge" #1602

wants to merge 2 commits into from
+70 −0

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jan 18, 2024 •
edited by openjdk bot
Loading

Hi all,

please review this patch that allow "merge style" pull requests to have just the title "Merge". If the title is just "Merge" then the bots will rewrite the title to Merge <HEAD> where <HEAD> is the HEAD of the pull request source branch. This is useful if the integrator knows that they want the HEAD of the pull request source branch as the second parent for the resulting merge commit (this removes the need to manually specify the HEAD hash in the PR title).

Testing

  • Added a new unit test

Thanks,
Erik

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace

Issue

  • SKARA-2150: Allow pull requests to have the title "Merge" (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/skara.git pull/1602/head:pull/1602
$ git checkout pull/1602

Update a local copy of the PR:
$ git checkout pull/1602
$ git pull https://git.openjdk.org/skara.git pull/1602/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1602

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/skara/pull/1602.diff

Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 18, 2024

👋 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 2150 2150: Allow pull requests to have the title "Merge" Jan 18, 2024
@openjdk openjdk bot added the rfr label Jan 18, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 18, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 18, 2024 •
edited
Loading

@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:

2150: Allow pull requests to have the title "Merge"

Reviewed-by: erikj, zsong

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 1 new commit pushed to the master branch:

  • 88c014c: 2143: Support selective tags mirroring

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 Jan 18, 2024
@edvbld
Copy link
Member Author

edvbld commented Jan 19, 2024

Thanks @erikj79 and @zhaosongzs for reviewing!

/integrate

@openjdk
Copy link

openjdk bot commented Jan 19, 2024

Going to push as commit 512311b.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 88c014c: 2143: Support selective tags mirroring

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 19, 2024
@openjdk openjdk bot closed this Jan 19, 2024
@openjdk
Copy link

openjdk bot commented Jan 19, 2024

@edvbld Pushed as commit 512311b.

💡 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
Reviewers

@erikj79 erikj79

@zhaosongzs zhaosongzs

Assignees
No one assigned
Labels
integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@edvbld @erikj79 @zhaosongzs