[enhanced-enums] RFR: Merge master [v4]

J.Duke duke at openjdk.java.net
Fri Sep 18 17:45:49 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 76 commits from the branch `master`that
> can **not** be merged into the branch `enhanced-enums`:
> The following file contains merge conflicts:
> 
> - .jcheck/conf
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[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
> enhanced-enums $ git pull https://github.com/openjdk/amber enhanced-enums
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +66:openjdk-bot-66
> $ git checkout openjdk-bot-66
> 
> # Merge the target branch
> $ git merge enhanced-enums
> 
> 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 openjdk-bot-66:66
> 
> _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

J. Duke has updated the pull request incrementally with 68 additional commits since the last revision:

 - manual merge
 - Merge master
 - Automatic merge of master into patterns-stage-2
 - Automatic merge of master into patterns-stage-2
 - Automatic merge of master into patterns-stage-2
 - Automatic merge of master into patterns-stage-2
 - Automatic merge of master into patterns-stage-2
 - Automatic merge of master into patterns-stage-2
 - Automatic merge of master into patterns-stage-2
 - Automatic merge of master into patterns-stage-2
 - ... and 58 more: https://git.openjdk.java.net/amber/compare/053f47d0...486f6649

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

Changes:
  - all: https://git.openjdk.java.net/amber/pull/51/files
  - new: https://git.openjdk.java.net/amber/pull/51/files/053f47d0..486f6649

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=amber&pr=51&range=03
 - incr: https://webrevs.openjdk.java.net/?repo=amber&pr=51&range=02-03

  Stats: 1244 lines in 32 files changed: 1156 ins; 56 del; 32 mod
  Patch: https://git.openjdk.java.net/amber/pull/51.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/51/head:pull/51

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


More information about the amber-dev mailing list