Follow-up from "Obtain merge commit via API for fast-forward plus squash merge"

The following discussion from !17052 (merged) should be addressed:

• @nick.thomas started a discussion: (+17 comments)

  How about if the merge fails with an error? Won't this lead to us filling in the squash_commit_sha incorrectly?