valhalla
valhalla copied to clipboard
draft lworld
Progress
- [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [ ] Change must not contain extraneous whitespace
- [ ] Commit message must refer to an issue
Error
⚠️ The pull request body must not be empty.
Integration blockers
⚠️ Whitespace errors (failed with updated jcheck configuration in pull request) ⚠️ Whitespace errors (failed with updated jcheck configuration in pull request) ⚠️ Whitespace errors (failed with updated jcheck configuration in pull request) ⚠️ Whitespace errors (failed with updated jcheck configuration in pull request) ⚠️ Whitespace errors (failed with updated jcheck configuration in pull request)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1669/head:pull/1669
$ git checkout pull/1669
Update a local copy of the PR:
$ git checkout pull/1669
$ git pull https://git.openjdk.org/valhalla.git pull/1669/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1669
View PR using the GUI difftool:
$ git pr show -t 1669
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1669.diff
:wave: Welcome back rhalade! 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.
❗ This change is not yet ready to be integrated. See the Progress checklist in the description for automated requirements.
@rhalade this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:
git checkout lworld
git fetch https://git.openjdk.org/valhalla.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push
:warning: @rhalade a branch with the same name as the source branch for this pull request (lworld) is present in the target repository. If you eventually integrate this pull request then the branch lworld in your personal fork will diverge once you sync your personal fork with the upstream repository.
To avoid this situation, create a new branch for your changes and reset the lworld branch. You can do this by running the following commands in a local repository for your personal fork. Note: you do not have to name the new branch NEW-BRANCH-NAME.
$ git checkout -b NEW-BRANCH-NAME
$ git branch -f lworld ab9f70dd5acd73744e3d82e9884985904f280c26
$ git push -f origin lworld
Then proceed to create a new pull request with NEW-BRANCH-NAME as the source branch and close this one.
⚠️ @rhalade This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).