Please describe the problem you think should be solved

#6548 (comment)

From @tierninho:

I noticed when you abort a fixed conflicted file in a merge commit, there is no "are you sure" check like we have in the existing merge flow. Is this needed for rebasing?

From @billygriffin

I think I'd generally be inclined to have a confirm on abort only if they've already resolved some subset of conflicts already (which is @tierninho's use case). In that case, by aborting you're effectively losing work, so my preference would be that this should exist.

[Optional] Do you have any potential solutions in mind?

Something based on what we've learned from Merge Conflicts. More to details to come.