[foreign-jextract] RFR: Merge foreign-abi

Jorn Vernee jvernee at openjdk.java.net
Thu May 28 10:21:16 UTC 2020

On Thu, 28 May 2020 10:04:32 GMT, J. Duke <duke at openjdk.org> wrote:

>> Hi all,
>> this is an _automatically_ generated pull request to notify you that there are 56 commits from the branch
>> `foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
>> The following files contains merge conflicts:
>> - make/autoconf/libraries.m4
>> - make/conf/jib-profiles.js
>> All Committers in this [project](https://openjdk.java.net/census#Optional[panama]) have access to my [personal
>> fork](https://github.com/openjdk-bot/panama-foreign) and can therefore help resolve these merge conflicts (you may want
>> to coordinate who should do this). The following paragraphs will give an example on how to solve these merge conflicts
>> and push the resulting merge commit to this 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://github.com/openjdk/panama-foreign) repository.  # Ensure target branch is up to date $
>> git checkout foreign-jextract $ git pull https://github.com/openjdk/panama-foreign foreign-jextract
>> # Fetch and checkout the branch for this pull request
>> $ git fetch https://github.com/openjdk-bot/panama-foreign +39:openjdk-bot-39
>> $ git checkout openjdk-bot-39
>> # Merge the target branch
>> $ git merge foreign-jextract
>> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create
>> a merge commit:
>> $ git add paths/to/files/with/conflicts
>> $ git commit -m 'Merge foreign-abi'
>> When you have created the merge commit, run the following command to push the merge commit to this pull request:
>> $ git push https://github.com/openjdk-bot/panama-foreign openjdk-bot-39:39
>> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
>> Thanks,
>> J. Duke
> /integrate

Just running the tests on this before sponsoring


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

More information about the panama-dev mailing list