[foreign-memaccess+abi] RFR: Merge master [v3]

J. Duke duke at openjdk.org
Fri Mar 10 14:32:50 UTC 2023


> 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+abi`:
> 
> Over 14 files contains merge conflicts.
> 
> All Committers in this [project](https://openjdk.org/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.org/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+abi
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess+abi
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +135:openjdk-bot-135
> $ git checkout openjdk-bot-135
> 
> # Merge the target branch
> $ git merge foreign-memaccess+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 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-135:135
> 
> 
> _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 incrementally with one additional commit since the last revision:

  Clean up TestVarArgs further

-------------

Changes:
  - all: https://git.openjdk.org/panama-foreign/pull/817/files
  - new: https://git.openjdk.org/panama-foreign/pull/817/files/d21c2089..734504e2

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=panama-foreign&pr=817&range=02
 - incr: https://webrevs.openjdk.org/?repo=panama-foreign&pr=817&range=01-02

  Stats: 7 lines in 1 file changed: 0 ins; 3 del; 4 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/817.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/817/head:pull/817

PR: https://git.openjdk.org/panama-foreign/pull/817


More information about the panama-dev mailing list