RFR: Merge jdk:master
duke at openjdk.java.net
Wed Dec 2 23:26:17 UTC 2020
On Wed, 2 Dec 2020 03:00:44 GMT, J. Duke <duke at openjdk.org> 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](https://openjdk.java.net/census#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.git master
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/lanai.git +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 https://github.com/openjdk-bot/lanai.git 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.
> J. Duke
More information about the lanai-dev