Integrated: Merge jdk:master
J. Duke
duke at openjdk.org
Fri Feb 17 18:41:49 UTC 2023
On Fri, 10 Feb 2023 19:08:08 GMT, J. Duke <duke at openjdk.org> wrote:
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 3910 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
>
> The following files contains merge conflicts:
>
> - make/autoconf/build-aux/config.sub
> - make/autoconf/toolchain.m4
> - 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 +10:openjdk-bot-10
> $ git checkout openjdk-bot-10
>
> # 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-10:10
>
>
> _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
This pull request has now been integrated.
Changeset: ef12616c
Author: J. Duke <duke at openjdk.org>
Committer: Johan Vos <jvos at openjdk.org>
URL: https://git.openjdk.org/mobile/commit/ef12616cc4dc70478aa4b776b38bd80e900620ff
Stats: 1157692 lines in 14366 files changed: 653201 ins; 350605 del; 153886 mod
Merge
-------------
PR: https://git.openjdk.org/mobile/pull/16
More information about the mobile-dev
mailing list