[foreign-abi] PR-Base-Hash: d34b4444ce5de3ec887a445c5287168947c1ea42: Cannot automatically merge foreign-memaccess to foreign-abi

[Jorn Vernee]

On Tue, 31 Mar 2020 17:44:20 GMT, J. Duke <duke at openjdk.org> wrote:

> Hi all,
> 
> this is an _automatically_ generated merge request to notify you that there is 1 commit from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following files contains merge conflicts:
> 
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/AbstractLayout.java
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/Foreign.java
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/InternalForeign.java
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryAddressImpl.java
> - test/jdk/java/foreign/TestNative.java
> - test/jdk/java/foreign/TestRebase.java
> - test/jdk/java/foreign/TestSegments.java
> - test/jdk/java/foreign/TestSharedAccess.java
> 
> The following paragraphs will give an example on how to solve these merge conflicts and create a pull request to
> integrate them. If you are using a workflow different from the one below, feel free to use that instead. It is
> important that the title of the pull request you create is `Merge foreign-memaccess`, otherwise the bots will _not_
> understand that the pull request you create is a "merge style" 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://git.openjdk.java.net/panama-foreign) repository. These commands will allow you to view
> and resolve the merge conflicts. Note that the name of the local branch in the commands,
> `merge-foreign-memaccess-into-foreign-abi-b126f277`, is just an example, feel free to give the local branch any name
> you prefer.  $ git checkout foreign-abi $ git pull https://git.openjdk.java.net/panama-foreign foreign-abi $ git
> checkout -b merge-foreign-memaccess-into-foreign-abi-b126f277 $ git pull https://git.openjdk.java.net/panama-foreign
> foreign-memaccess  When you have resolved the conflicts resulting from the `git pull` command above, run the following
> commands to create a merge commit:  $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge foreign-memaccess'
> 
> The commit message does not have to be `Merge foreign-memaccess`, but it is convenient for when you will create a pull
> request. Many tools will by default use the commit message of the most recent commit on a branch as the title for a
> pull request from that branch. This means that if you use the commit message `Merge foreign-memaccess` as the commit
> message then the title of the pull request will (depending to tools used to create the pull request) be of a format
> that the bots expect.  Proceed to [publish the local
> branch](https://wiki.openjdk.java.net/display/SKARA/FAQ#FAQ-HowdoIpushalocalbranchtoaremoterepository?) and [create a
> pull request](https://wiki.openjdk.java.net/display/SKARA/FAQ#FAQ-HowdoIcreateapullrequest?) towards the `foreign-abi`
> branch in the [openjdk/panama-foreign](https://git.openjdk.java.net/panama-foreign) repository. The resulting pull
> request can then integrated as usual once it has passed all required pre-integration checks.  Thanks, J. Duke

I'm currently looking at this

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

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