fix bogus error when 'got cherrypick' merges changes into a locally added file reported by + ok naddy
2021-09-02T19:13:50