Skip to content

Keep committing ... spinner when conflict resolved

Sean McGivern requested to merge keep-committing-spinner-when-conflict-resolved into master

What does this MR do?

When a conflict is resolved successfully, keep the 'committing ...' spinner until the new page loads rather than showing the standard button again, which is misleading. The old behaviour looks like this:

Resolve_merge_conflict

I don't think this needs a CHANGELOG entry as it's pretty minor.

Merge request reports