amber icon indicating copy to clipboard operation
amber copied to clipboard

Merge master

Open openjdk-bot opened this issue 5 years ago • 2 comments

Hi all,

this is an automatically generated pull request to notify you that there are 129 commits from the branch masterthat can not be merged into the branch sealed-types:

The following file contains merge conflicts:

  • src/java.base/share/classes/java/lang/Package.java

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/amber repository.

# Ensure target branch is up to date
$ git checkout sealed-types
$ git pull https://github.com/openjdk/amber.git sealed-types

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +75:openjdk-bot-75
$ git checkout openjdk-bot-75

# Merge the target branch
$ git merge sealed-types

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 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/amber.git openjdk-bot-75:75

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

  • [x] Change must not contain extraneous whitespace
  • [x] Commit message must refer to an issue
  • [x] Change must be properly reviewed

Testing

Linux additional Linux x64 Linux x86 Windows x64 macOS x64
Build ✔️ (8/8 passed) ✔️ (2/2 passed) ✔️ (2/2 passed) ✔️ (2/2 passed) ❌ (1/2 failed)
Test (tier1) ✔️ (9/9 passed) ❌ (1/9 failed) ✔️ (9/9 passed)

Failed test tasks

Download

$ git fetch https://git.openjdk.java.net/amber pull/72/head:pull/72 $ git checkout pull/72

openjdk-bot avatar Nov 26 '20 22:11 openjdk-bot

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

bridgekeeper[bot] avatar Nov 26 '20 22:11 bridgekeeper[bot]

Webrevs

mlbridge[bot] avatar Nov 26 '20 22:11 mlbridge[bot]

@openjdk-bot This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

bridgekeeper[bot] avatar Dec 06 '22 04:12 bridgekeeper[bot]

@openjdk-bot This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

bridgekeeper[bot] avatar Jan 03 '23 09:01 bridgekeeper[bot]