[foreign-abi] [Rev 01] RFR: Cannot automatically merge openjdk/panama-foreign:foreign-memaccess to foreign-abi

J.Duke duke at openjdk.java.net
Fri Mar 13 14:13:42 UTC 2020


> Could *not* automatically merge 109 commits from foreign-memaccess into foreign-abi.
> The following files contains merge conflicts:
> 
> - src/java.base/share/classes/java/lang/ClassLoader.java
> - src/java.base/share/classes/java/lang/Runtime.java
> - src/java.base/share/classes/java/lang/System.java
> - src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
> - src/java.base/share/native/libjava/ClassLoader.c
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemorySegmentImpl.java
> 
> 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-abi
> $ git checkout --branch merge-foreign-memaccess-into-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 foreign-memaccess'
> 
> Push the merge commit to your personal fork:
> 
> $ git push -u origin merge-foreign-memaccess-into-foreign-abi
> 
> Now proceed to create a pull request towards this repository.
> If you are using the [Skara](https://wiki.openjdk.java.net/display/skara#Skara-Skara)CLI tooling then you can run the
> following command to create the pull request:
> $ git pr create
> 
> This pull request will be closed automatically by a bot once the merge conflicts have been resolved.

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.

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/49/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/49/files/af93b670..af93b670

Webrevs:
 - full: https://webrevs.openjdk.java.net/panama-foreign/49/webrev.01
 - incr: https://webrevs.openjdk.java.net/panama-foreign/49/webrev.00-01

  Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/49.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/49/head:pull/49

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


More information about the panama-dev mailing list