RFR: Merge jdk:master [v2]
J. Duke
duke at openjdk.org
Mon Mar 25 17:41:37 UTC 2024
> 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:
>
> - make/modules/java.base/lib/CoreLibraries.gmk
>
> All Committers in this [project](https://openjdk.org/census#mobile) have access to my [personal fork](https://github.com/openjdk-bot/mobile) 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.org/display/skara#Skara-Personalforks) of the [openjdk/mobile](https://github.com/openjdk/mobile) repository.
>
>
> # Ensure target branch is up to date
> $ git checkout master
> $ git pull https://github.com/openjdk/mobile.git master
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/mobile.git +14:openjdk-bot-14
> $ git checkout openjdk-bot-14
>
> # 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/mobile.git openjdk-bot-14:14
>
>
> _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
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains two commits:
- Merge branch 'master' into openjdk-bot-14
- 8328824: Clean up java.base native compilation
Reviewed-by: erikj
-------------
Changes: https://git.openjdk.org/mobile/pull/21/files
Webrev: https://webrevs.openjdk.org/?repo=mobile&pr=21&range=01
Stats: 248 lines in 7 files changed: 111 ins; 46 del; 91 mod
Patch: https://git.openjdk.org/mobile/pull/21.diff
Fetch: git fetch https://git.openjdk.org/mobile.git pull/21/head:pull/21
PR: https://git.openjdk.org/mobile/pull/21
More information about the mobile-dev
mailing list