[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Tue May 21 06:27:03 UTC 2024
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 84 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following file contains merge conflicts:
>
> - .jcheck/conf
>
> All Committers in this [project](https://openjdk.org/census#panama) have access to my [personal fork](https://github.com/openjdk-bots/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-bots/panama-foreign.git +20:openjdk-bot-20
> $ git checkout openjdk-bot-20
>
> # 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-bots/panama-foreign.git openjdk-bot-20:20
>
>
> _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 1158 additional commits since the last revision:
- Merge branch 'foreign-memaccess+abi' into 20
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- ... and 1148 more: https://git.openjdk.org/panama-foreign/compare/e06e6d41...e7eda4cf
-------------
Changes:
- all: https://git.openjdk.org/panama-foreign/pull/915/files
- new: https://git.openjdk.org/panama-foreign/pull/915/files/e06e6d41..e7eda4cf
Webrevs:
- full: https://webrevs.openjdk.org/?repo=panama-foreign&pr=915&range=01
- incr: https://webrevs.openjdk.org/?repo=panama-foreign&pr=915&range=00-01
Stats: 655 lines in 5 files changed: 648 ins; 4 del; 3 mod
Patch: https://git.openjdk.org/panama-foreign/pull/915.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/915/head:pull/915
PR: https://git.openjdk.org/panama-foreign/pull/915
More information about the panama-dev
mailing list