[jdk11u-dev] RFR: 8276536: Update TimeZoneNames files to follow the changes made by JDK-8275766

openjdk-notifier[bot] duke at openjdk.java.net
Thu Nov 18 09:47:02 UTC 2021


On Mon, 15 Nov 2021 21:22:15 GMT, Martin Doerr <mdoerr at openjdk.org> wrote:

> Clean Backport of JDK-8276536 on top of JDK-8275766.

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:


git checkout TheRealMDoerr-backport-5b4e3986
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

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

PR: https://git.openjdk.java.net/jdk11u-dev/pull/630


More information about the jdk-updates-dev mailing list