This has been a small irritation for a while. After resolving conflicts and staging changes, I hit the "Continue..." button
which pops up a dialog
the conflict resolution process already has a lot of steps -- open conflict solver, use it, save, close, select "yes, stage the results". This dialog doesn't seem necessary.
If the purpose is to guide the user to "continue after resolving conflicts", it shouldn't come up unless there are unresolved conflicts / unstaged files.
If the purpose is to request confirmation before a dangerous operation, the operation is already not easy to trigger accidentally, and also not so dangerous.
Can this be smoothed out a bit, either by default or with a low-level property?