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.

Sign up for GitHub

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

Jump to bottom

Revert "Reject conflicting updates" #2612

Merged
merged 1 commit into from
Nov 10, 2017
Merged

Revert "Reject conflicting updates" #2612

merged 1 commit into from
Nov 10, 2017

Conversation

schmidt-sebastian
Copy link
Contributor

Reverts #2582 to address build failure:

[ERROR] /home/travis/build/GoogleCloudPlatform/google-cloud-java/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BasePath.java:[100,11] name clash: isPrefixOf(com.google.cloud.firestore.BasePath<B>) and isPrefixOf(B) have the same erasure
[ERROR] /home/travis/build/GoogleCloudPlatform/google-cloud-java/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldPath.java:[59,16] cannot find symbol
  symbol:   class AutoValue_FieldPath
  location: class com.google.cloud.firestore.FieldPath

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

LGTM - wait for at least one build to pass

@schmidt-sebastian schmidt-sebastian merged commit 7104fe9 into master Nov 10, 2017
@schmidt-sebastian schmidt-sebastian deleted the revert-2582-mrschmidt-rejectconflicts branch February 3, 2018 00:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garrettjonesgoogle garrettjonesgoogle Awaiting requested review from garrettjonesgoogle

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@schmidt-sebastian @garrettjonesgoogle @googlebot