From 0f2b33b67a999cce789526fb7c4a977eb70f8715 Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Mon, 2 Mar 2020 09:43:12 -0800 Subject: [PATCH] reflect/protoregistry: add link to namespace conflict FAQ Updates golang/protobuf#1039. Change-Id: Ia9f80da5dab1e6cd3cf9ad512b78b63b32065c31 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/221782 Reviewed-by: Herbie Ong --- reflect/protoregistry/registry.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reflect/protoregistry/registry.go b/reflect/protoregistry/registry.go index 4b5d8fb5..4fc81587 100644 --- a/reflect/protoregistry/registry.go +++ b/reflect/protoregistry/registry.go @@ -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 }