Integrated: Merge jdk:master

J.Duke duke at
Wed Dec 2 23:53:07 UTC 2020

On Wed, 2 Dec 2020 03:00:44 GMT, J. Duke <duke at> wrote:

> Hi all,
> this is an _automatically_ generated pull request to notify you that there are 28 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
> The following file contains merge conflicts:
> - src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
> All Committers in this [project]( 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 +6:openjdk-bot-6
> $ git checkout openjdk-bot-6
> # 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-6:6
> _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: adbb74a9
Author:    J. Duke <duke at>
Committer: Kevin Rushforth <kcr at>
Stats:     4015 lines in 176 files changed: 3023 ins; 385 del; 607 mod

Merge jdk:master



More information about the lanai-dev mailing list