this is an automatically generated pull request to notify you that there are 2 commits 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 +35:openjdk-bot-35 $ git checkout openjdk-bot-35 # 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-35:35
Note: if you are using SSH to push commits to GitHub, then change the URL in the above
@openjdk-bot This change now passes all automated pre-integration checks, type
Since the source branch of this PR was last updated there have been 150 commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge