[Integrated] [foreign-memaccess] RFR: Merge master
duke at openjdk.java.net
Thu May 28 09:55:53 UTC 2020
On Wed, 27 May 2020 12:17:31 GMT, J. Duke <duke at openjdk.org> wrote:
> Hi all,
> this is an _automatically_ generated pull request to notify you that there are 54 commits from the branch `master`that
> can **not** be merged into the branch `foreign-memaccess`:
> Over 40 files contains merge conflicts.
> 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-memaccess $ git pull https://github.com/openjdk/panama-foreign foreign-memaccess
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +38:openjdk-bot-38
> $ git checkout openjdk-bot-38
> # Merge the target branch
> $ git merge foreign-memaccess
> 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 master'
> 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-38:38
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> J. Duke
This pull request has now been integrated.
Author: J. Duke <duke at openjdk.org>
Committer: Maurizio Cimadamore <mcimadamore at openjdk.org>
Stats: 66487 lines in 335 files changed: 61377 ins; 4074 del; 1036 mod
More information about the panama-dev