[patterns-stage-2] Withdrawn: Merge master

[duke]

On Tue, 10 Nov 2020 15:09:15 GMT, J. Duke <duke at openjdk.org> wrote:

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 380 commits from the branch `master`that can **not** be merged into the branch `patterns-stage-2`:
> 
> The following files contains merge conflicts:
> 
> - src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
> - src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
> - src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
> - src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
> 
> All Committers in this [project](https://openjdk.java.net/census#amber) 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-stage-2
> $ git pull https://github.com/openjdk/amber.git patterns-stage-2
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber.git +73:openjdk-bot-73
> $ git checkout openjdk-bot-73
> 
> # Merge the target branch
> $ git merge patterns-stage-2
> 
> 
> 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/amber.git openjdk-bot-73:73
> 
> 
> _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 pull request has been closed without being integrated.

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

PR: https://git.openjdk.org/amber/pull/70