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

always keep local if conv version is the same #23079

Merged
merged 2 commits into from Mar 16, 2020
Merged

always keep local if conv version is the same #23079

merged 2 commits into from Mar 16, 2020

Conversation

@mmaxim
Copy link
Contributor

mmaxim commented Mar 16, 2020

No description provided.

@mmaxim mmaxim requested a review from joshblum Mar 16, 2020
@joshblum

This comment has been minimized.

Copy link
Member

joshblum commented Mar 16, 2020

What does this fix?

@mmaxim

This comment has been minimized.

Copy link
Contributor Author

mmaxim commented Mar 16, 2020

Well currently it breaks everything for some reason

fix
@mmaxim mmaxim merged commit 67d2270 into master Mar 16, 2020
2 checks passed
2 checks passed
ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
@mmaxim mmaxim deleted the mike/fixmerge branch Mar 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.