[foreign-jextract] RFR: Cannot automatically merge foreign-abi to foreign-jextract

[Jorn Vernee]

On Thu, 26 Mar 2020 13:19:52 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-abi`that can **not** be merged into the branch `foreign-jextract`:
> The following file contains merge conflicts:
> 
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.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-abi`, 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-abi-into-foreign-jextract-3eda9176`, is just an example, feel free to give the local branch any name you
> prefer.  $ git checkout foreign-jextract $ git pull https://git.openjdk.java.net/panama-foreign foreign-jextract $ git
> checkout -b merge-foreign-abi-into-foreign-jextract-3eda9176 $ git pull https://git.openjdk.java.net/panama-foreign
> foreign-abi  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-abi'
> 
> The commit message does not have to be `Merge foreign-abi`, 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-abi` 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-jextract` 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

Closing this since the merge was handled by https://github.com/openjdk/panama-foreign/pull/69

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

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