Integrated: Merge jdk:master

J.Duke duke at
Wed Sep 16 18:38:33 UTC 2020

On Wed, 16 Sep 2020 14:03:03 GMT, J. Duke <duke at> wrote:

> 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]([lanai]) have access to my [personal
> fork]( 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]( of the
> [openjdk/lanai]( repository.  # Ensure target branch is up to date $ git checkout
> master $ git pull master
> # Fetch and checkout the branch for this pull request
> $ git fetch +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 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

This pull request has now been integrated.

Changeset: 10867134
Author:    Kevin Rushforth <kcr at>
Committer: Jayathirth D V <jdv at>
Stats:     1 line in 1 file changed: 0 ins; 0 del; 1 mod

8253206: Enforce whitespace checking for additional source files

Reviewed-by: prr, erikj, jdv



More information about the lanai-dev mailing list