Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge foreign-abi #152

Closed
wants to merge 1 commit into from
Closed

Merge foreign-abi #152

wants to merge 1 commit into from

Conversation

@openjdk-bot
Copy link
Contributor

@openjdk-bot openjdk-bot commented May 6, 2020

Hi all,

this is an automatically generated pull request to notify you that there are 2 commits from the branch foreign-abithat can not be merged into the branch foreign-jextract:

The following file contains merge conflicts:

  • test/jdk/java/jextract/smoke.h

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).
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 of the 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 +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 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-35:35

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


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Download

$ git fetch https://git.openjdk.java.net/panama-foreign pull/152/head:pull/152
$ git checkout pull/152

Reviewed-by: sundar
@openjdk openjdk bot added the failed-auto-merge label May 6, 2020
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 6, 2020

👋 Welcome back duke! A progress list of the required criteria for merging this PR into foreign-jextract will be added to the body of your pull request.

@openjdk
Copy link

@openjdk openjdk bot commented May 6, 2020

@openjdk-bot This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. After integration, the commit message will be:

Merge foreign-abi
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 150 commits pushed to the foreign-jextract branch:

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 foreign-jextract into your branch, and then specify the current head hash when integrating, like this: /integrate aeec1cba55de61044a0ad631015c7430d4126922.

As you do not have Committer status in this project, an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready rfr labels May 6, 2020
@openjdk-bot
Copy link
Contributor Author

@openjdk-bot openjdk-bot commented May 6, 2020

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented May 6, 2020

@openjdk-bot
Your change (at version 023cac3) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added the sponsor label May 6, 2020
@JornVernee JornVernee force-pushed the openjdk:foreign-jextract branch from 79c0cea to aeec1cb May 6, 2020
@JornVernee JornVernee closed this May 6, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 8, 2020

Webrevs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants