Joe Tsai 831b8f59b4 reflect/protoregistry: add conflict override ... The ignoreConflict function provides the ability to ignore certain conflicts. By default, all conflicts are ignored with a log message produced instead. Change-Id: I67fe56eef492e12421e5c8cb8d618dc2a46c82ed Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186658 Reviewed-by: Damien Neil <dneil@google.com>		2019-07-18 17:47:11 +00:00
..
build_test.go	all: implement proto1 weak fields	2019-07-15 18:44:12 +00:00
build.go	reflect/protoregistry: add conflict override	2019-07-18 17:47:11 +00:00
desc_init.go	internal/strs: unify string manipulation functionality	2019-07-09 19:57:23 +00:00
desc_lazy.go	all: support enforce_utf8 override	2019-07-15 19:53:05 +00:00
desc_list_gen.go	internal/filedesc, internal/filetype: initial commit	2019-06-20 02:06:11 +00:00
desc_list.go	reflect/protoreflect: add FileDescriptor.SourceLocations	2019-07-13 00:15:59 +00:00
desc_test.go	proto: move T->*T wrappers from internal/scalar to proto	2019-07-12 17:35:01 +00:00
desc.go	reflect/protoregistry: provide more informative errors for conflicts	2019-07-15 20:39:24 +00:00
placeholder.go	reflect/protoreflect: add FileDescriptor.SourceLocations	2019-07-13 00:15:59 +00:00