RFR: Merge jdk:master

J.Duke duke at openjdk.java.net
Wed Sep 16 14:09:39 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.

J. Duke


Commit messages:
 - 8253206: Enforce whitespace checking for additional source files

The webrev contains the conflicts with master:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=lanai&pr=99&range=00.conflicts

Changes: https://git.openjdk.java.net/lanai/pull/99/files
  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 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