RFR: Merge jdk:master [v2]
J.Duke
duke at openjdk.java.net
Tue Dec 29 13:06:19 UTC 2020
> 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 files contains merge conflicts:
>
> - make/autoconf/flags.m4
> - make/autoconf/toolchain.m4
>
> All Committers in this [project](https://openjdk.java.net/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.java.net/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 +6:openjdk-bot-6
> $ git checkout openjdk-bot-6
>
> # 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-6:6
>
> _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 incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 1907 additional commits since the last revision:
- Merge jdk:master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- ... and 1897 more: https://git.openjdk.java.net/mobile/compare/d29c78da...2d60f61b
-------------
Changes:
- all: https://git.openjdk.java.net/mobile/pull/11/files
- new: https://git.openjdk.java.net/mobile/pull/11/files/d29c78da..2d60f61b
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=mobile&pr=11&range=01
- incr: https://webrevs.openjdk.java.net/?repo=mobile&pr=11&range=00-01
Stats: 150 lines in 18 files changed: 130 ins; 0 del; 20 mod
Patch: https://git.openjdk.java.net/mobile/pull/11.diff
Fetch: git fetch https://git.openjdk.java.net/mobile pull/11/head:pull/11
PR: https://git.openjdk.java.net/mobile/pull/11
More information about the mobile-dev
mailing list