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 #148

Closed
wants to merge 1 commit into from
Closed

Merge foreign-abi #148

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 is 1 commit from the branch foreign-abithat can not be merged into the branch foreign-jextract:

The following file contains merge conflicts:

  • src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayouts.java

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 +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 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-33:33

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/148/head:pull/148
$ git checkout pull/148

@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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 6, 2020

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 6, 2020

Mailing list message from Maurizio Cimadamore on panama-dev:

I'll take care of this in

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

Maurizio

On 06/05/2020 15:01, J.Duke wrote:

Hi all,

this is an _automatically_ generated pull 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/incubator/foreign/MemoryLayouts.java

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 +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 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-33:33

_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

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

Commit messages:
- JDK-8244270: reorganize ABI-dependent layout constants (second attempt)

The webrev contains the conflicts with foreign-jextract:
- merge conflicts: https://webrevs.openjdk.java.net/panama-foreign/148/webrev.00.conflicts

Changes: https://git.openjdk.java.net/panama-foreign/pull/148/files
Stats: 1129 lines in 25 files changed: 309 ins; 700 del; 120 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/148.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/148/head:pull/148

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

@JornVernee JornVernee closed this May 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants