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

[Alexey Ivanov]

On Thu, 25 May 2023 05:59:32 GMT, ScientificWare <duke at openjdk.org> wrote:

>> ScientificWare has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Update src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
>>   
>>   Remove space.
>>   
>>   Co-authored-by: Alexey Ivanov <alexey.ivanov at oracle.com>
>
> Delay due to the reorganization of my contribution schedule caused by new requests.

> @scientificware Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See [OpenJDK Developers’ Guide](https://openjdk.org/guide/#working-with-pull-requests) for more information.

I see you merged master. In this case, force-push shouldn't be necessary unless your local branch diverged from your remote one.

This is what I usually do to sync:


git checkout master
git pull upstream master
git push upstream master

I run these three commands before creating a new branch and whenever I need to get latest changes.

To update another branch, merge master into it:

git checkout <branch-you-work-on>
# Pull any changes from remote, just in case
git pull origin <branch-you-work-on>
# Now merge master into the branch
git merge master -m 'Merge master'
# If there are any conflicts, resolve them and commit
git push origin <branch-you-work-on>

Replace `<branch-you-work-on>` with a real name of your branch.

I hope it helps in the future.

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

PR Comment: https://git.openjdk.org/jdk/pull/9825#issuecomment-1667930116