RFR: Merge jdk:master

Kevin Rushforth kcr at openjdk.java.net
Fri Sep 11 16:47:32 UTC 2020

On Fri, 11 Sep 2020 15:20:14 GMT, J. Duke <duke at openjdk.org> 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](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 +4:openjdk-bot-4
> $ git checkout openjdk-bot-4
> # 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-4:4
> _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

I get the following error, so I'll create a PR using my own personal fork.

git push git at github.com:openjdk-bot/lanai.git openjdk-bot-4:4
ERROR: Permission to openjdk-bot/lanai.git denied to kevinrushforth.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

@edvbld @rwestberg can you take a look when you get a chance? It's not urgent, and fairly low priority, since I can
always use my personal fork.


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

More information about the lanai-dev mailing list