Skip to content

Commit

Permalink
reflect/protoregistry: add link to namespace conflict FAQ
Browse files Browse the repository at this point in the history
Updates golang/protobuf#1039.

Change-Id: Ia9f80da5dab1e6cd3cf9ad512b78b63b32065c31
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/221782
Reviewed-by: Herbie Ong <[email protected]>
  • Loading branch information
neild committed Mar 2, 2020
1 parent fea7d52 commit 0f2b33b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions reflect/protoregistry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
var ignoreConflict = func(d protoreflect.Descriptor, err error) bool {
log.Printf(""+
"WARNING: %v\n"+
"A future release will panic on registration conflicts.\n"+
// TODO(blocks): Add a URL pointing to documentation on how to resolve conflicts.
"A future release will panic on registration conflicts. See:\n"+
"https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict\n"+
"\n", err)
return true
}
Expand Down

0 comments on commit 0f2b33b

Please sign in to comment.