RFR: Cannot automatically merge openjdk/panama-foreign:foreign-memaccess to foreign-abi

[Jorn Vernee]

On Fri, 7 Feb 2020 16:31:32 GMT, J. Duke <duke at openjdk.org> wrote:

> The following commits from `openjdk/panama-foreign:foreign-memaccess` could *not* be automatically merged into `foreign-abi`:
> 
> - 2a345730: 8238320: What is the alignment of padding layouts?
> 
> To manually resolve these merge conflicts, please create a personal fork of https://git.openjdk.java.net/panama-foreign and execute the following commands:
> 
> $ git checkout foreign-abi
> $ git pull https://git.openjdk.java.net/panama-foreign foreign-memaccess
> 
> When you have resolved the conflicts resulting from the above commands, run:
> 
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge'
> 
> Push the resolved merge conflict to your personal fork and create a pull request towards this repository.
> 
> This pull request will be closed automatically by a bot once the merge conflicts have been resolved.

I'm looking into this

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

PR: https://git.openjdk.java.net/panama-foreign/pull/11