RFR: Merge jdk:master [v2]

J.Duke duke at openjdk.java.net
Wed Sep 16 18:38:31 UTC 2020

> Hi all,
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `jdk:master`that
> can **not** be merged into the branch `master`:
> The following file contains merge conflicts:
> - .jcheck/conf
> All Committers in this [project](https://openjdk.java.net/census#Optional[lanai]) have access to my [personal
> fork](https://github.com/openjdk-bot/lanai) 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/lanai](https://github.com/openjdk/lanai) repository.  # Ensure target branch is up to date $ git checkout
> master $ git pull https://github.com/openjdk/lanai master
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/lanai +5:openjdk-bot-5
> $ git checkout openjdk-bot-5
> # Merge the target branch
> $ git merge master
> 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 jdk: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/lanai openjdk-bot-5:5
> _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

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes
the unrelated changes brought in by the merge/rebase.


  - all: https://git.openjdk.java.net/lanai/pull/99/files
  - new: https://git.openjdk.java.net/lanai/pull/99/files/10867134..10867134

 - full: https://webrevs.openjdk.java.net/?repo=lanai&pr=99&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=lanai&pr=99&range=00-01

  Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
  Patch: https://git.openjdk.java.net/lanai/pull/99.diff
  Fetch: git fetch https://git.openjdk.java.net/lanai pull/99/head:pull/99

PR: https://git.openjdk.java.net/lanai/pull/99

More information about the lanai-dev mailing list