Commit graph

1 commit

Author SHA1 Message Date
Stan Hu
5632079c36 Properly clear the merge error upon rebase failure
If `merge_error` is ever set after a failure, it is never cleared, even
after a subsequent, successful rebase. We now clear this field whenever
a successful rebase occurs.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139
2019-05-15 21:34:59 -07:00