[concise-method-declarations] RFR: Merge master
J.Duke
duke at openjdk.java.net
Thu Dec 10 22:06:20 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 140 commits from the branch `master`that can **not** be merged into the branch `concise-method-declarations`:
The following files contains merge conflicts:
- src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
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 concise-method-declarations
$ git pull https://github.com/openjdk/amber.git concise-method-declarations
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +76:openjdk-bot-76
$ git checkout openjdk-bot-76
# Merge the target branch
$ git merge concise-method-declarations
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-76:76
_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:
- 8257912: Convert enum iteration to use range-based for loops
- 8258056: jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java fails against jdk17
- 8257971: (fs) Remove unused code from WindowsPath.subpath(begin, end)
- 8258054: runtime/sealedClasses/GetPermittedSubclassesTest.java fails w/ jdk17
- 8256424: Move ciSymbol::symbol_name() to ciSymbols::symbol_name()
- 8258018: Remove arrayOop.inline.hpp
- 8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems
- 8257450: Start of release updates for JDK 17
- 8258015: [JVMCI] JVMCI_lock shouldn't be held while initializing box classes
- 8257966: Instrument test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java
- ... and 130 more: https://git.openjdk.java.net/amber/compare/36209b70...80dac5a8
The webrev contains the conflicts with concise-method-declarations:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=73&range=00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/73/files
Stats: 32334 lines in 749 files changed: 24130 ins; 5389 del; 2815 mod
Patch: https://git.openjdk.java.net/amber/pull/73.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/73/head:pull/73
PR: https://git.openjdk.java.net/amber/pull/73
More information about the amber-dev
mailing list