this is an automatically generated pull request to notify you that there is 1 commit from the branch
The following file contains merge conflicts:
All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
# 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 +33:openjdk-bot-33 $ git checkout openjdk-bot-33 # Merge the target branch $ git merge foreign-jextract
When you have resolved the conflicts resulting from the
$ 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-33:33
Note: if you are using SSH to push commits to GitHub, then change the URL in the above
The text was updated successfully, but these errors were encountered:
I'll take care of this in
On 06/05/2020 15:01, J.Duke wrote: