mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-01-01 11:58:21 +00:00
831b8f59b4
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> |
||
---|---|---|
.. | ||
testprotos | ||
registry_test.go | ||
registry.go |