[foreign-memaccess] RFR: Merge master [v3]
J.Duke
duke at openjdk.java.net
Fri Jun 26 13:50:43 UTC 2020
> 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 files contains merge conflicts:
>
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
>
> All Committers in this [project](https://openjdk.java.net/census#Optional[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 foreign-memaccess
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +43:openjdk-bot-43
> $ git checkout openjdk-bot-43
>
> # 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 openjdk-bot-43:43
>
> _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:
Fix using of `ofPaddingBits` in javadoc
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/215/files
- new: https://git.openjdk.java.net/panama-foreign/pull/215/files/86781948..c273798d
Webrevs:
- full: https://webrevs.openjdk.java.net/panama-foreign/215/webrev.02
- incr: https://webrevs.openjdk.java.net/panama-foreign/215/webrev.01-02
Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/215.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/215/head:pull/215
PR: https://git.openjdk.java.net/panama-foreign/pull/215
More information about the panama-dev
mailing list