Skip to content

Properly clear the merge error upon rebase failure

Stan Hu requested to merge sh-fix-rebase-error-clearing into master

If merge_error is ever set, it is never cleared, even after a successful rebase. We now clear this field whenever a successful rebase occurs.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139

Edited by Stan Hu

Merge request reports