fix(controller): make git push correctly handle "incorrect old value provided"

fix(controller): make git push correctly handle "incorrect old value provided" #25258