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

J.Duke duke at openjdk.java.net
Tue Feb 11 10:02:05 UTC 2020


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.

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

Commits:
 - 2a345730: 8238320: What is the alignment of padding layouts?

Changes: https://git.openjdk.java.net/panama-foreign/pull/11/files
 Webrev: https://webrevs.openjdk.java.net/panama-foreign/11/webrev.00
  Stats: 51 lines in 3 files changed: 40 ins; 9 del; 2 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/11.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/11/head:pull/11

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


More information about the panama-dev mailing list