[foreign] RFR: Cannot automatically merge openjdk/panama-foreign:master to foreign

[Erik Helin]

On Fri, 13 Mar 2020 11:01:46 GMT, J. Duke <duke at openjdk.org> wrote:

> Could *not* automatically merge 107 commits from master into foreign.
> The following files contains merge conflicts:
> 
> - src/java.base/share/classes/java/lang/ClassLoader.java
> - src/java.base/share/classes/java/lang/Runtime.java
> - src/java.base/share/classes/java/lang/System.java
> - src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
> - src/java.base/share/native/libjava/ClassLoader.c
> 
> To manually resolve these merge conflicts, please create a personal fork of https://git.openjdk.java.net/panama-foreign
> and execute the following commands:
> $ git checkout foreign
> $ git pull https://git.openjdk.java.net/panama-foreign foreign
> $ git checkout --branch merge-master-into-foreign
> $ git pull https://git.openjdk.java.net/panama-foreign master
> 
> When you have resolved the conflicts resulting from the above commands, run:
> 
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge master'
> 
> Push the merge commit to your personal fork:
> 
> $ git push -u origin merge-master-into-foreign
> 
> Now proceed to create a pull request towards this repository.
> If you are using the [Skara](https://wiki.openjdk.java.net/display/skara#Skara-Skara)CLI tooling then you can run the
> following command to create the pull request:
> $ git pr create
> 
> This pull request will be closed automatically by a bot once the merge conflicts have been resolved.

Closing this since automatic merging from `master` to `foreign` has been turned off.

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

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