zhangskz

Results 4 issues of zhangskz

We have a PR (https://github.com/protocolbuffers/protobuf/pull/11174) that fails the [mergeable check in main](https://github.com/protocolbuffers/protobuf/blob/main/.github/mergeable.yml), even though the PR is to 21.x with a different mergeable.yml. Ideally, we would like to configure main's...

Cherry-pick of 2257232676e60f1d06f8c9545c88d1a73a3a8f54, with conflicts resolved from java generator refactor 8e3e09937e1514323cad74b000450c6bd65c04e7 This can cause ODR violations in downstream users who link against both the bootstrapped proto and transitive C++ gencode...

Re-enable windows bazel test. PiperOrigin-RevId: 630443328 Cherry-pick of cd83a75315e7b564f8204630d86932d2791963a4