Skip to content
This repository has been archived by the owner. It is now read-only.

Merge jdk:master #95

Merged
merged 1 commit into from Sep 11, 2020
Merged

Merge jdk:master #95

merged 1 commit into from Sep 11, 2020

Conversation

openjdk-bot
Copy link

@openjdk-bot openjdk-bot commented Sep 11, 2020

Hi all,

this is an automatically generated pull request to notify you that there is 1 commit from the branch jdk:masterthat can not be merged into the branch master:

The following file contains merge conflicts:

  • .jcheck/conf

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 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


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/lanai pull/95/head:pull/95
$ git checkout pull/95

@openjdk openjdk bot added the failed-auto-merge label Sep 11, 2020
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 11, 2020

👋 Welcome back duke! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added merge-conflict rfr labels Sep 11, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 11, 2020

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Sep 11, 2020

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

git push git@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.

@openjdk openjdk bot merged commit e7823d8 into openjdk:master Sep 11, 2020
1 check passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
failed-auto-merge merge-conflict rfr
2 participants