-
Notifications
You must be signed in to change notification settings - Fork 6k
8266820: micro java/nio/SelectorWakeup.java has wrong copyright header #3952
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
Conversation
👋 Welcome back bpb! A progress list of the required criteria for merging this PR into |
@bplb this pull request can not be integrated into git checkout SelectorWakeup-copyright-8266820
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
@@ -1,32 +1,24 @@ | |||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is your repo up to date? This micro is in the channels directory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that not where it is now?
https://github.com/openjdk/jdk/tree/master/test/micro/org/openjdk/bench/java/nio/channels
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was not initially up to date but I merged. I think you were looking at a prior commit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe the bot has fixed the merge conflict. 00-Full suggests you changed the file in the old location, 00-Full suggests you changed the correct file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The manual merge fixed it.
@bplb 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. After integration, the commit message for the final commit will be:
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 20 new commits pushed to the
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 |
/integrate |
@bplb Since your change was applied there have been 22 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit 7a0a57c. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Please review this correction of a copyright header. Thanks.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3952/head:pull/3952
$ git checkout pull/3952
Update a local copy of the PR:
$ git checkout pull/3952
$ git pull https://git.openjdk.java.net/jdk pull/3952/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 3952
View PR using the GUI difftool:
$ git pr show -t 3952
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3952.diff