[foreign-jextract] Integrated: Merge foreign-memaccess+abi
J.Duke
duke at openjdk.java.net
Wed Mar 24 12:24:37 UTC 2021
On Wed, 24 Mar 2021 11:23:55 GMT, J. Duke <duke at openjdk.org> wrote:
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `foreign-memaccess+abi`that can **not** be merged into the branch `foreign-jextract`:
>
> The following file contains merge conflicts:
>
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
>
> 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-jextract
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-jextract
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +91:openjdk-bot-91
> $ git checkout openjdk-bot-91
>
> # Merge the target branch
> $ git merge foreign-jextract
>
> 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+abi'
>
>
> 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-91:91
>
> _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: 4e696684
Author: J. Duke <duke at openjdk.org>
Committer: Jorn Vernee <jvernee at openjdk.org>
URL: https://git.openjdk.java.net/panama-foreign/commit/4e696684
Stats: 6824 lines in 84 files changed: 3076 ins; 2730 del; 1018 mod
Merge foreign-memaccess+abi
-------------
PR: https://git.openjdk.java.net/panama-foreign/pull/473
More information about the panama-dev
mailing list