fix(protoc): Mirror protoc's field name conflict resolution logic in client generation [ggj]#781

Merged

miraleung merged 12 commits intomasterfrom

Jun 29, 2021

Commits on Jun 24, 2021

fix(protoc): Mirror protoc's field name conflict resolution logic in client gen
miraleung
committed

Commits on Jun 25, 2021

fix: update Field - set default value for originalName
miraleung
committed
fix: update googleapis-discovery hash with monolith removal
miraleung
committed
fix: post-conflict resolution goldens
miraleung
committed
fix(build): Update googleapis-discovery hash to fix compute integration test
miraleung
committed
fix(protoc): Mirror protoc's field name conflict resolution logic in client gen
miraleung
committed
fix: update Field - set default value for originalName
miraleung
committed
fix: post-conflict resolution goldens
miraleung
committed
Merge branch 'dev/protoc' of github.com:googleapis/gapic-generator-java into dev/protoc
miraleung
committed

Commits on Jun 29, 2021