Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ICU-21949 tzdata2022a update #26

Merged
merged 1 commit into from
Mar 18, 2022
Merged

Conversation

yumaoka
Copy link
Member

@yumaoka yumaoka commented Mar 17, 2022

No description provided.

Copy link
Member

@markusicu markusicu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rslgtm

@jefgen
Copy link
Member

jefgen commented Mar 18, 2022

GitHub looks to be stuck on the "Checking for ability to merge automatically…" status.

I'm going to try closing and re-opening this PR to work-around it.

@jefgen jefgen closed this Mar 18, 2022
@jefgen jefgen reopened this Mar 18, 2022
@jefgen
Copy link
Member

jefgen commented Mar 18, 2022

Closing and re-opening the PR didn't help.

I'm going to open a support ticket with GitHub about this...

@yumaoka
Copy link
Member Author

yumaoka commented Mar 18, 2022

@jefgen Thank you for looking into this. I guess I'd create a new PR.

@jefgen
Copy link
Member

jefgen commented Mar 18, 2022

The GitHub support suggested trying to change the branch target, and then changing it back.
I'll try doing that and see if that helps. If not we might need to make a new PR.

@jefgen jefgen changed the base branch from main to ucm11792 March 18, 2022 17:23
@jefgen jefgen changed the base branch from ucm11792 to main March 18, 2022 17:24
@yumaoka
Copy link
Member Author

yumaoka commented Mar 18, 2022

@jefgen Thanks. It looks it did not work. I'll close this and create a new one.

@jefgen
Copy link
Member

jefgen commented Mar 18, 2022

One other idea/suggestion (if that might be easier than a whole new PR):
Perhaps change the commit message slightly and force-push an update? That might get it unstuck since the commit hash would change.

@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@yumaoka
Copy link
Member Author

yumaoka commented Mar 18, 2022

@jefgen I did git amend and force push. It resolved the issue!

@yumaoka yumaoka merged commit 4ada84d into unicode-org:main Mar 18, 2022
@yumaoka yumaoka deleted the tz2022a-data branch March 18, 2022 20:48
@jefgen
Copy link
Member

jefgen commented Mar 19, 2022

I did git amend and force push. It resolved the issue!

Nice! I'm glad that was able to fix the issue!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants