[foreign-abi] RFR: Merge foreign-memaccess [v3]
J.Duke
duke at openjdk.java.net
Fri Oct 9 12:25:31 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 91 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following file contains merge conflicts:
>
> - src/hotspot/share/utilities/growableArray.hpp
>
> 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-abi $ git pull https://github.com/openjdk/panama-foreign.git foreign-abi
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +62:openjdk-bot-62
> $ git checkout openjdk-bot-62
>
> # Merge the target branch
> $ git merge foreign-abi
>
> 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 foreign-memaccess'
>
>
> 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-62:62
>
> _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 refreshed the contents of this pull request, and previous commits have been removed. The incremental views
will show differences compared to the previous content of the PR. The pull request contains one new commit since the
last revision:
Merge branch 'foreign-abi' into openjdk-bot-62
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/376/files
- new: https://git.openjdk.java.net/panama-foreign/pull/376/files/c8c60657..b9fd32ef
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=376&range=02
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=376&range=01-02
Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/376.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/376/head:pull/376
PR: https://git.openjdk.java.net/panama-foreign/pull/376
More information about the panama-dev
mailing list