tree 81d9de3815f710273a5fc8b18d84d0bf977b9f8b
parent bda0ea800220a3218823450ba0bebd19006aeca0
author Joe Tsai <joetsai@digital-static.net> 1563415701 -0700
committer Joe Tsai <joetsai@digital-static.net> 1563472031 +0000

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>