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

Update turbine #14076

Closed
wants to merge 1 commit into from
Closed

Update turbine #14076

wants to merge 1 commit into from

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Oct 4, 2021

@cushon cushon requested a review from comius October 4, 2021 23:37
@google-cla google-cla bot added the cla: yes label Oct 4, 2021
@cushon cushon mentioned this pull request Oct 4, 2021
@comius
Copy link
Contributor

comius commented Oct 5, 2021

@cushon github says "This branch has conflicts that must be resolved". I guess you need to fetch main branch and rebase?

@cushon
Copy link
Contributor Author

cushon commented Oct 5, 2021

@comius whoops, I rebased it

@comius
Copy link
Contributor

comius commented Oct 5, 2021

@philwo, ready for manual merge

@bazel-io bazel-io closed this in f28f697 Oct 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants