Do we have to merge OwlBot pull requests in order? #8546
Labels
priority: p3
Desirable enhancement or fix. May not be included in next release.
type: question
Request for information or clarification. Not an issue.
Do we have to merge OwlBot pull requests in order to avoid old changes overriding new changes?
No, the order is not important as long as you "Regenerate" the pull request. The OwlBot service's regeneration uses the latest master branch of googleapis-gen repository.
For example, #8495 ("chore(bazel): [Many APIs] update protobuf to v3.21.7") came before #8534 ("feat: [cloudasset] add a new searchable field kmsKeys").
I merged #8534 first and then regenerated #8495. As the result, the pull request #8495 does not have any diff from main branch.
One of the changes in 8534 was "kmsKeys" field in
AssetServiceClient.java
. By checking out the branch of #8495, I confirmed that the changes in the pull request does not revert back the recent AssetServiceClient.java changes and there's no changes to merge in java-asset module (because the changes to the module were already merged to main branch by #8534 .The text was updated successfully, but these errors were encountered: