[patterns] PR-Base-Hash: 88b98e20d93867e6664b1a1d00da8b76bcffb5f3: Merge pattern-runtime

[Erik Helin]

On Wed, 15 Apr 2020 08:43:46 GMT, J. Duke <duke at openjdk.org> wrote:

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 494 commits from the branch
> `pattern-runtime`that can **not** be merged into the branch `patterns`:
> The following file contains merge conflicts:
> 
> - make/CompileInterimLangtools.gmk
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[jdk]) have access to my [personal
> fork](https://github.com/openjdk-bot/amber) 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/amber](https://github.com/openjdk/amber) repository.  # Ensure target branch is up to date $ git checkout
> patterns $ git pull https://github.com/openjdk/amber patterns
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +1:openjdk-bot-1
> $ git checkout openjdk-bot-1
> 
> # Merge the target branch
> $ git merge patterns
> 
> 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 pattern-runtime'
> 
> 
> 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/amber openjdk-bot-1:1
> 
> _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

This automatic merge request contains an error due to now fixed bug in the merge bot. I'm closing this one and let the
merge bot re-create a new one if needed.

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

PR: https://git.openjdk.java.net/amber/pull/12