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

Rejecting conflicting field paths #2625

Merged

Conversation

schmidt-sebastian
Copy link
Contributor

@schmidt-sebastian schmidt-sebastian commented Nov 15, 2017

Second attempt for #2582

This is the same PR, but I removed the clashing isPrefixOf.

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Nov 15, 2017
@pongad
Copy link
Contributor

pongad commented Nov 15, 2017

This LGTM but wasn't #2582 already merged? Was it reverted or something?

@schmidt-sebastian
Copy link
Contributor Author

This LGTM but wasn't #2582 already merged? Was it reverted or something?

Yeah, I had to revert it because it broke the google-cloud-java build.

@schmidt-sebastian schmidt-sebastian merged commit 876d1fb into googleapis:master Nov 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants