This repository was archived by the owner on Apr 21, 2026. It is now read-only.
v2855: Merge pull request #3447 from zendesk/grosser/conflict2
retry conflicts with update resourceVersion
retry conflicts with update resourceVersion