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

[J.Duke]

On Thu, 12 Mar 2020 17:37:05 GMT, J. Duke <duke at openjdk.org> wrote:

> The following commits from foreign-memaccess could *not* be automatically merged into foreign-abi:
> 
> - a5399004: 8240874: Add finer-grained access control for memory segments
> 
> The following files contains merge conflicts:
> 
> - 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.

Merge conflicts have been resolved, closing this PR

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

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