RFR: JDK-8292276 : Add named colors from CSS Color Module Level 4 [v28]

[Alexey Ivanov]

On Sun, 12 Feb 2023 08:59:42 GMT, ScientificWare <duke at openjdk.org> wrote:

>> This is referenced in Java Bug Database as
>> - [JDK-8292276 : Add named colors from CSS Color Module Level 4](https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8292276)
>> 
>> This is tracked in JBS as 
>> - [JDK-8292276 : Add named colors from CSS Color Module Level 4](https://bugs.openjdk.java.net/browse/JDK-8292276)
>> 
>> Adds missing color names, defined by CSS Level 4, in CSS.java :
>> CSS Color Module Level 4
>> W3C Candidate Recommendation Snapshot, 5 July 2022
>> [7.1 Named Colors](https://www.w3.org/TR/css-color-4/#named-color)
>> 
>> Designed from : [ScientificWare JDK-8292276 : Add named colors from CSS Color Module Level 4](https://github.com/scientificware/jdk/issues/12)
>
> ScientificWare has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Delete configure
>   
>   Delete configure from the pull request.

You should not force-push. The bot provided [the instructions](https://github.com/openjdk/jdk/pull/9825#issuecomment-1417199887) on how to resolve the merge conflict.

What I usually do is:

git checkout master
git pull upstream master
git checkout <branch>
git merge master -m 'Merge master'


If there are conflicts, you have to resolve them and then use `git commit -m 'Merge master'` to commit the changes.

As the last step, push the local changes to your fork by using `git push` (if there's remote tracking branch is correctly set up for the current branch) or `git push origin <branch>`.

The above implies _origin_ is the name of your fork and _upstream_ is the remote for the upstream which is `https://github.com/openjdk/jdk.git` in this case.

> Delete configure from the pull request.

Somehow you removed the `configure` script altogether. You should restore it to the way it is in the _master_ branch.

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

PR: https://git.openjdk.org/jdk/pull/9825