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

Revert "Start 1.64.0 development cycle" #11069

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

YifeiZhuang
Copy link
Contributor

This reverts commit 338a687.

Looks a mistake. The "Start 1.64.0 development cycle" should only be on the master branch

@temawi
Copy link
Contributor

temawi commented Apr 3, 2024

Sorry, I missed the branch when I reviewed the PR.

@ejona86
Copy link
Member

ejona86 commented Apr 3, 2024

Which PR? I see two commits on different branches that point to the same PR? I don't understand how github would do that.
338a687
b3ffb50

I figure one might be the original and one is github's rebased/squashed/rewritten version. And when creating a new branch, you can maybe push unreviewed commits. Even assuming a human mistake, things seem weirder than that.

@YifeiZhuang
Copy link
Contributor Author

Which PR? I see two commits on different branches that point to the same PR? I don't understand how github would do that. 338a687 b3ffb50

I figure one might be the original and one is github's rebased/squashed/rewritten version. And when creating a new branch, you can maybe push unreviewed commits. Even assuming a human mistake, things seem weirder than that.

I don't remember exactly. My local v1.63.x branch is already updated to the current v1.63.x, which includes the "Start 1.64.0 development cycle" commit.

My concern was that the command git log --pretty=format:%H --grep "^Start $MAJOR.$((MINOR+1)).0 development cycle$" upstream/master does not seem work for me. The result is empty. So I probably manually checked out a branch with the commit number before the commit of "Start 1.64.0 development cycle". But that also should not include the commit in the release branch? Or what if I made a mistake and included the commit, not from master but locally, and pushed to the cuted branch?

@YifeiZhuang
Copy link
Contributor Author

No PR for this one.
There is only one PR #11030 for the master.

@YifeiZhuang YifeiZhuang merged commit e0f134d into grpc:v1.63.x Apr 3, 2024
15 checks passed
@YifeiZhuang YifeiZhuang deleted the release-v1.63.0 branch April 3, 2024 23:58
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants