17173 improve error message #17350
17173 improve error message #17350
Conversation
Improve the error message logged when concurrent modifications occur and --experimental_guard_against_concurrent_changes is set.
sgowroji
added
team-Remote-Exec
|
Hmm, given the merge conflict it looks like maybe these changes already merged under #17323 but the PR was still open due to the missing CLA (since the commit listed my GitHub email rather than my Google email as the author)? It looks like this can be abandoned, but I'd appreciate confirmation of that from a maintainer since I hadn't thought #17323 had been merged. |
|
#17323 wasn't merged into 6.1. The merge conflict is because this PR is comparing against |
|
Just updating the PR to target the 6.1.0 branch didn't work because then it tries to pull in other commits. Might the best solution be for @kshyanashree to update the author email in the cherrypick commit in #17323 to use my Google email ([email protected])? |
|
Closing this PR because it’s already merged in the master. |
Creating a new PR after updating my GitHub account's settings to show my @google.com email address in my commit header. This should have identical content to #17323, other than my email address.