[stats-before-this-super] RFR: Merge master
J.Duke
duke at openjdk.java.net
Thu Jan 6 22:08:56 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 39 commits from the branch `master`that can **not** be merged into the branch `stats-before-this-super`:
The following file contains merge conflicts:
- .jcheck/conf
All Committers in this [project](https://openjdk.java.net/census#amber) have access to my [personal fork](https://github.com/openjdk-bot/amber) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the [openjdk/amber](https://github.com/openjdk/amber) repository.
# Ensure target branch is up to date
$ git checkout stats-before-this-super
$ git pull https://github.com/openjdk/amber.git stats-before-this-super
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +80:openjdk-bot-80
$ git checkout openjdk-bot-80
# Merge the target branch
$ git merge stats-before-this-super
When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit:
$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge master'
When you have created the merge commit, run the following command to push the merge commit to this pull request:
$ git push https://github.com/openjdk-bot/amber.git openjdk-bot-80:80
_Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
Thanks,
J. Duke
-------------
Commit messages:
- 4884570: StreamPrintService.isAttributeValueSupported does not work properly for SheetCollate
- 8273322: Enhance macro logic optimization for masked logic operations.
- 8279505: Update documentation for RETRY_COUNT and REPEAT_COUNT
- 8279339: (ch) Input/Output streams returned by Channels factory methods don't support concurrent read/write ops
- 8211004: javac is complaining about non-denotable types and refusing to generate the class file
- Merge
- 8279529: ProblemList java/nio/channels/DatagramChannel/ManySourcesAndTargets.java on macosx-aarch64
- 8278612: [macos] test/jdk/java/awt/dnd/RemoveDropTargetCrashTest crashes with VoiceOver on macOS
- 8279525: ProblemList java/awt/GraphicsDevice/CheckDisplayModes.java on macosx-aarch64
- 8278897: Alignment of heap segments is not enforced correctly
- ... and 29 more: https://git.openjdk.java.net/amber/compare/299022df...b3dbfc64
The webrev contains the conflicts with stats-before-this-super:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=78&range=00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/78/files
Stats: 4400 lines in 113 files changed: 3732 ins; 408 del; 260 mod
Patch: https://git.openjdk.java.net/amber/pull/78.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/78/head:pull/78
PR: https://git.openjdk.java.net/amber/pull/78
More information about the amber-dev
mailing list