In investigating this bug, I also found the --no-retry behaviour on the resolve command is inverted. See bug 1762979
In investigating this bug, I also found the --no-retry behaviour on the resolve command is inverted. See bug 1762979