[foreign-memaccess] Integrated: Merge master
J.Duke
duke at openjdk.java.net
Fri Oct 16 12:18:00 UTC 2020
On Fri, 16 Oct 2020 11:01:11 GMT, J. Duke <duke at openjdk.org> wrote:
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 107 commits from the branch `master`that
> can **not** be merged into the branch `foreign-memaccess`:
> The following file contains merge conflicts:
>
> - src/hotspot/share/classfile/classFileParser.cpp
>
> All Committers in this [project](https://openjdk.java.net/census#panama) have access to my [personal
> fork](https://github.com/openjdk-bot/panama-foreign) 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/panama-foreign](https://github.com/openjdk/panama-foreign) repository. # Ensure target branch is up to date $
> git checkout foreign-memaccess $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +63:openjdk-bot-63
> $ git checkout openjdk-bot-63
>
> # Merge the target branch
> $ git merge foreign-memaccess
>
> 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/panama-foreign.git openjdk-bot-63:63
>
> _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: 63df0eca
Author: J. Duke <duke at openjdk.org>
Committer: Maurizio Cimadamore <mcimadamore at openjdk.org>
URL: https://git.openjdk.java.net/panama-foreign/commit/63df0eca
Stats: 313864 lines in 794 files changed: 303554 ins; 5431 del; 4879 mod
Merge master
-------------
PR: https://git.openjdk.java.net/panama-foreign/pull/381
More information about the panama-dev
mailing list