allenpradeep commented on pull request #13990: URL: https://github.com/apache/beam/pull/13990#issuecomment-780774503
> @allenpradeep The merge conflict looks to be due to #13804, which upgraded guava. I don't think it's an actual conflict, it's just that [007c0ab](https://github.com/apache/beam/commit/007c0ab955b73962c5188412b446f2bec0408cc7) is upgrading gRPC, which is on an adjacent line. The resolution should be to just make sure we upgrade both. @TheNeuralBit Done. PTAL ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
