[concise-method-declarations] RFR: Merge master

J.Duke duke at openjdk.java.net
Thu Jan 14 22:05:36 UTC 2021


Hi all,

this is an _automatically_ generated pull request to notify you that there are 133 commits from the branch `master`that can **not** be merged into the branch `concise-method-declarations`:

The following file contains merge conflicts:

- 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 +78:openjdk-bot-78
$ git checkout openjdk-bot-78

# 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-78:78

_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:
 - 8259350: Add some internal debugging APIs to the debug agent
 - 8259278: Optimize Vector API slice and unslice operations
 - 8255019: Shenandoah: Split STW and concurrent mark into separate classes
 - 8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result
 - 8253866: Security Libs Terminology Refresh
 - 8259727: Remove redundant "target" arguments to methods in Links
 - 8259723: Move Table class to formats.html package
 - 8258912: Remove JVM options CountJNICalls and CountJVMCalls
 - 8226416: MonitorUsedDeflationThreshold can cause repeated async deflation requests
 - 8259699: Reduce char[] copying in URLEncoder.encode(String, Charset)
 - ... and 123 more: https://git.openjdk.java.net/amber/compare/555641ed...d18d26e8

The webrev contains the conflicts with concise-method-declarations:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=76&range=00.conflicts

Changes: https://git.openjdk.java.net/amber/pull/76/files
  Stats: 25230 lines in 738 files changed: 13772 ins; 7357 del; 4101 mod
  Patch: https://git.openjdk.java.net/amber/pull/76.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/76/head:pull/76

PR: https://git.openjdk.java.net/amber/pull/76


More information about the amber-dev mailing list